I agree that changing the tires (and maybe the wheelset) to something more efficient for your current bike is the most economical way to go. You don't have to spend $texas, but some thinner slicks with better compounds will help quite a bit. You may lose some comfort depending on how aggressive of a set up you go, but having some extra speed is nice.

Once you get some miles under your belt, things get a little easier, a little more routine and you can fine tune what you want. You could then have a MUCH better idea what you want in a next bike, if another at all.