If you ever climb out of the saddle or think you may someday, also consider your out-of-saddle position when chosing a stem length. If you get the stem too short, you'll feel cramped out of the saddle. Your knees may come within striking distance of the bars. You may be climbing with your shoulders almost in front of your hands, resulting in poor balance and control.
Also, make sure your bottom bracket to saddle setback is right before thinking about changing your stem. If you get that right, you should be able to hold your upper body in balance on a trainer while padaling if you let go with your hands (at least briefly).
Oil is good, grease is better.
2007 Peter Mooney w/S&S couplers/Terry Butterfly
1993 Bridgestone MB-3/Avocet O2 Air 40W
1980 Columbus Frame with 1970 Campy parts
1954 Raleigh 3-speed/Brooks B72