You might try a Gary Fisher. When i was testing bikes the salesman said i didn't look like i fit them as they are usually for guys with longer torso's. i tried every size 16" to 23" and they all felt terrible (i don't have a long torso). the "right" size for me was a 19" but it already had a long stem and still felt too small, it would have needed a really long stem and a seatpost with lots of setback and move the saddle disturbingly far back. so i settled on a 21", the geometry felt great with no adjustments, though i have like -1" standover
I wanted a do-it-all geometry because this one bike is my commuter, long-road rider, light family xc-er, and aggressive better-bring-a-first-aid-kit xc-er.