I'm 6'1" with 34" inside leg and after much demo-ing went for an 18". I've fitted a 75mm stem and inline post and it feels spot on for size. My wife nicked the 18" demo bike off me and really liked it (she's 5'10", 34" leg) – and much as I hate to admit it, the bike did look pretty much the right size for her.
TBH, we've both currently got quite compact bikes to suit our favourite tight twist woodland trails, so the 18" Orange did feel a bit long at first – However, its turn of speed on singletrack surprised me, and on descents and drops, the larger size makes it very stable & confidence inspiring. Difficult to explain, but the bike rides smaller than it is – if that makes sense.
TBH, I reckon you'd get away with both sizes, but if you want 'flickability' over stability, the 16" might be better. If it's of any use, Glenn at Pedal Power in Loughboro' has an 18" demo.