Ermmm you do realise that you dont HAVE to use a blackberry for corporate email??. Theres a plan called BIS which most if not all networks now provide

. Allows you to still get push email without having to be on a BES which is the corporate email system.
Ive had my Blackberry Bold since Dec and its the best device ive ever had the pleasure of using and ive had a shedload of phones over the yrs and nothing as of yet can come quite close to the Bold...its an absolute joy to use...has a hardware keyboard so typing out emails/texts are much more easier. It might be a bit big though but i dont find that to be a problem.
I had the storm myself back in Dec as well and although its a stunning piece of kit...the software isnt quite up to the hardware plus it lacks WIFI....although newer revisions of the software is making the device much much better than it was first released.
Another one to consider is the 8900 Curve which is a really nice device...similar to the Bold but is lighter, thinner and not as wide as the Bold. Only thing that puts me off about it is the lack of 3G but like the Bold it has WIFI and the screen again like the Bold is simply gorgeous.
Ii suggest you pop over to a Vodafone store and play with the live models...u dont have to be a voda customer...i was in a voda shop the other day with the missus and shes going for the 8900 curve herself...finally converted her

lol. But they had live models of the storm, Bold and the 8900 so she tried them all out.
But seriously id stay away from the Storm for the time being...im waiting for the 2nd gen Storm to come out...rumours are that it will be a slider with touchscreen and hardware keyboard...plus it will have the form factor like the HTC Touch Diamond Pro and Xperia X1.