I own also a "squarrish" camera but never restrict myself to fit all in the square format. What would that be good for? I also do not try to fit compositions to paperdimensions. I crop (negative/paper) to whatever is best for the picture.
Free yourself from this doctrine of using a fixed aspectratio for all your pictures.