I think that your bike is too small if you've had to rig it to fit like you want it, at least to that extent. That's a lot of modification, and pretty extreme modification, for a roadie bike. I'd guess that you're on too small of a frame, but that's my opinion from seeing how you're set up. It's one thing to put a slightly longer stem on a bike because you like a long cockpit, or tweak your saddle position a little, but your bike definately looks like you've had to work hard to get it to fit.

I'd suggest narrowing your online search and then finding some bikes in local shops to ride. Companies tend to build their bikes to similar fit characteristics year after year; the differences come when they move to compact geomoetry or change their philosophy on bike fit. If you find a Trek from a couple of years ago, riding a Trek new today will give you a good idea of how that used bike will fit. Make sure you compare the same material and, if you can, the same model within a line. Even if they're separated by a couple of model years, the fit might very well be identical.