A couple of related thoughts:

1. Another folder: http://www.xootr.com/folding-bicycle.html (there's also custom ordering from Human Powered Machines, IIRC)...ask them about the geometry on the small. The Swift gets rave reviews (see bikeforums.net for a really long thread about them) and is used as a road bike rather often as I understand it.

2. They might be hard to find at the moment, but the Cannondale Hooligan is another 20" option. I had one for a bit (the 2011 8), and loved it, but opted to try a MTB as my first foray back into cycling. The Hooligan is very nimble and no slouch on speed. I'd probably be fine on it now. Worth trying if you find one and think it might fit you.

3. Consider swapping parts once you have a frame that fits your legs well. I am a long person, and spent several appointments (mainly because we had to acquire parts not on hand already) with a bike fitter at REI to get the right fit for my MTB and it was well worth it. We switched out the seat post for one with more setback, changed the stem to a much steeper angle (30 deg. + IIRC, but about the same length -- there are also adjustable stems) and added a Delta stem riser. But if you can get one custom made for you obviously that's even better. But a little tweaking of existing parts can make all the difference, as long as the frame fits your legs and desired posture. (Beware of bikes with non-standard dimensions for things like handlebars, stem, or seatpost, though, which will limit the number of other parts you could swap in. I went with a cheaper model for that reason and will just upgrade components as I go.)