At this point, my budget is pretty low... Once I've been doing this for a bit, I will brave the Local Bike Shops -- maybe wait until later in the season when they have their fall closeouts -- and see what a newer bike might do for me.
Thanks for the tip on the Orbea... yeah, Orca isn't the most complimentary name I could think of but if it works... well, what's in a name!