I've been having trouble finding a comfortable shorts and rash guard top for DS this year. He's on the broad/husky side. The one that I bought from Lands End based on his current clothing size is uncomfortably tight. When I size up, the shorts become too long. Is there a boys bathing suit brand that tends to have a more generous cut?