Rather than square cut swimming trunks that I have always thought a tad uncomfortable have you considered Brazilian style sungas?
To the uninitiated they may look like square cuts but they are in fact a very full brief without the annoyance of a square cuts little legs.
https://www.ebay.co.uk/itm/112785463...Cclp%3A2334524