+1 for the Singular!
Sam (the guy behind Singular) is a really nice fella, and I'm sure he's be happy to give you a demo of one of his Swifts, or anything else he has in your size.
The Swift is one of the best bikes I have ever ridden. I think it would really suit your riding style, and may even give you confidence to ride stuff you wouldn't normally.
If you have a little more cash, you could consider a Singular Pegasus. Sam has them made by Nevi in Italy, and you get your choice of cable routing etc. so you can get it tweaked to suit your Rolhoff hub.
I've ridden my mate Steve's Pegasus, and I have to say, it blew me away. His weighs under 19lbs as he had it built up (ss).
http://www.singletrackworld.com/forum/t ... s-titanium
Ahh, but the dice cannot read their own spotshttp://www.bryankidd.co.ukLet me know what you think of my Tomac screenprints http://www.retrobike.co.uk/forum/viewto ... p;t=288972