Paul, I will also put a good word out for CyclistConnection. The owner Rick, and all the employees are good people. Very knowledgeable too. If you can wait another month or 2, they do a Parking Lot sale/Swap meet there. It's only once a year, and you will find your best deal from there then. I have been riding with them just about every warm Tuesday for the past 4 years.
I've followed a similar journey to a lot of guys on here apparently. I bought a WalMart special about 6 years ago, to get back into riding. Ended up buying a slightly used road bike from the Swap Meet after about 2 years on the Wally bike. HUGE DIFFERENCE