What does the collapsing of the 6 gain? appx 1/2-3/4"?
You could go with the Mamiya 7 & mask the film aperture to 6X6 if you really like the square. Then you have the availability of the new camera & lenses.