OP...I'd put you on a medium frame...somewhere around 18" unless you're built long legged/ short torso'd.
I'm 6'1.5" with approx. 34" inseam and ride an 18.5" frame. When I was doing strictly XC...I was riding 19-20" frames. I go around 23.5" on the TT length. I prefer slightly smallish frames for shredding the Gnar. The Roadie in you may prefer to be a bit more stretched out.
...and yes, I give myself a bit of marble clearance.