OK, so my XXL is a little out there in sizing! But there are two other "normal tall size" guys out there that make more sensible points of reference:
1) Josh Ibbett has an XL, but tha's to get a longer, racey position.
2) Dave Arthur, who is more your size, has the L and whilst he's fast on race day on it, he built it up with the focus on being a fast trail bike, and it's very, very good at that, so I'd maybe go with the L. That said, it's well worth trying to get a test ride first of course.
Not sure about the "they come up short in the top tube" comment, maybe some facts and figures from the geometry charts are better to look at than that comment, my XXL has a massive 26" top tube, yes it's an XXL but that's one of the longest top tubes I can find on any stock bike, even looking at other XXL and 22" frames!
The XL has a 25" top tube, which is a length that I can still get away with, and is long enough for me to still get a stretched, head down bum up position. The L has a 24" top tube. Maybe get a tape measure on your current frame? The bent top tube means plenty of standover pretty much no matter what size seat tube you get.
Hope that helps and, more importantly, that you enjoy your new bike, no matter what you end up with