I'd go with a Storm with discs too. It's only a question of whether to upgrade from my (nearly identical) 4130 speed with rim brakes just for the discs, or get a trifold, only for travel as I don't commute. I don't need an upgrade yet. Perhaps before this year is out, I'll do a takedown-size-evaluation of my bifold, as well as watch Southwest Airlines' bike policy, and monitor the latest in trifolds. I don't need a trifold if I can fly with my bifold without additional cost and a lot of effort.

For now, I've bought time, by repositioning my rim brake pads closer to the axle (rim sidewalls worn); I don't want to buy new wheels when a complete upgrade may be in my future.