I'd go with bust. It's much easier to take in a waist on a dress (if you want to make alterations, that is).
i agree with aneleh i'd go with the large. u dont want to be swimming in it!
It looks like that dress has so much extra fabric around the waist and hip area that the large would be fine!