Looking for travel step-up recommendations, 2-board quiver

Hey all,

I surf the 5'11" Lost Swordfish (33.5 l) as my daily driver (love it) but find that I feel undergunned as soon as it's well overhead or there are strong currents (maxed-out french beachies, Moroccan pointbreaks).

Feeling the urge to spend money on a second board to complete the 2-board Quiver.
I am looking for something that I can take out to be confident in big, good surf, basically anything where I wouldn't want the fish out anymore. I quite like the LibTech construction of the Swordfish, but as I am landlocked and have to travel everywhere to surf, the board takes quite the beating, but that kind of only leaves me with the sabo taj as an option, and I feel like 6.2 might be too small and 6.6 too much volume for a step-up (might be wrong here).

Anyways, I would love to hear some opinions or recommendations, especially on sizing the board.

I am intermediate, quite fit, 1.87 m tall, and 84 kg heavy.

I also own a 6'5" 36L shortboard, but I don't like the shape, as I feel all of the foam is under my belly rather than my chest; it feels more like an awkwardly oversized HPSB rather than a step-up.