I own a body suit that's not a wetsuit, but since I have no intention of dunking the figure in the water, it can serve the purpose of looking like a wetsuit without actually being a wetsuit. It's quite stretchy and thin, so it should accomodate a muscular body. But if I went with an actual wetsuit, I already own a slim body for that as well. Decisions, decisions...
Ideally, cost permitting, I'd do an actual wetsuit with a muscular body. The problem lies in finding an actual wetsuit that can accomodate a muscular body while still allowing the fatigues to be worn over it, as you've pointed out.