Welcome to Flyertalk, Clarea1.
I would think BA F both ways is your best bet here - it is more spacious overall than CX J. I'm not familiar with the SQ seat however.
If going for BA, I'd suggest your partner ask the crew if they can use the upstairs (CW) toilets for getting changed - they are far more spacious than the F toilets.