You seem to know what you want, but not what you NEED.

I would suggest finding the most highly-trained/acclaimed local fitter and paying them what they need to figure out what YOU need geometrically from a frame. All you know in THAT regard is that your current bike is too small it seems. If they have their stuff together, and know what you want/can do on the bike, they can run you through their ringer and give you a set of numbers. Start there, and everything else should be preference, aesthetics, and how much dough you want to spend.