If your able to swing towards a rigid frame maybe consider a cannondale hooligan, its compact and customisable, I myself was going to look for a foldy but being 17.5 stone and them being quite flexy, I wanted a bike as an all rounder, strong, something for distance and fitness work but comfy and upright and 8 speeds or more, it seems to fit the bill so I may get one soon!