If you decide to buy the cheaper bike but think you want an upgrade of a few components, talk to the LBS about it when you buy. If you ask them to upgrade the parts before you take the bike home, you will pay only for the price difference between the stock and upgraded parts, because they can sell the stock parts as new. If you wait, you'll probably pay full price for the upgraded parts, plus labor.
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