Aside from making sure your current bike is functioning properly, there is little difference other than components between the ones you are looking at and what you have now. My biggest suggestion if you want more pep is to get some 700x28 slick tires. Something like the gator skins will drop the effort level of your ride considerably for $80.

If a new bike will get you energized, go for it, but I'm betting you can tweak your current bike to what you want for less than the budget of a new bike.