The second one, but cut at pieces, not combined. 
Just updated the Cubemap Splitter with support for horizontal strips (6x1) or horizontal grid (3x2) formats, so those can now be split into individual frames or exported as a panorama. If you are importing 6 individual images, just select all 6 at once and they will automatically get stitched together!
Still looking into some other approaches or possible UI adjustments, though it will take a little time :P