I'm F or G and have good success with TYR and speedo competition suits. Plenty of support and boob containment due to the compression.

Re: short or average waist suits: I am super short waisted & pretty short but wear a much taller, average waisted suit b/c the boobs take up a lot of material. So perhaps try on a couple of suits just to make sure...