JuneHawk!!! So good to see you!!!!
I'm the same height as NYbiker, but with the exact opposite bike fit: WSD are instruments of misery to me, and regular geometry fit fabulously.
Height alone is never a reason to recommend WSD. A short woman could fit better on WSD (like NYbiker) and another woman the same height might fit better on a regular fit.
Trek420 is a bit shorter than you, and she has had some fine rides on regular fit bikes.
Ride lots of bikes, ride ones you aren't even considering buying (like a Surly) ride a couple different sizes in each model. Take a couple weeks of just test rides to get a feel for the geometry your body works best with.
Did the shop that sold you the 40cm (!!??!!? for someone 5 foot 2!?!?!!?) take it back?