Can anybody help me with this?

I'm trying to find what my body type is and what kind of clothing I should wear in order to make myself appear a little curvier, particularly up top.

At first I though I was a rectangle, since I'm slim and not at all busty, but when I entered my measurements into one of those online generator thingies it said I was a pear. However, I feel that my shoulders are more on the broad side and that the calculator didn't take that into account. Later I looked at the Wikipedia article on body shape and it said I was a bottom heavy hourglass, which I calculated with the formula they provided: If (hips − bust) ≥ 3.6" AND (hips − bust) < 10" AND (hips − waist) ≥ 9" AND (high hip/waist) < 1.193 then one would be a bottom hourglass according to them. Their idea of a triangle/pear is: If (hips − bust) ≥ 3.6" AND (hips − waist) < 9".

Here are my measurements in inches:
shoulders--35
bust (if you can call it that! haha)--31
waist--26 or 27, depends how long ago I ate!
high hips--31
hips--36

And I'm about 5'4'' or 5'5''

What body shape do you think I am? What can I do to make my body shape appear less boyish? Thanks, and sorry this is so long!