You will get more help at a corporate store, especially if you are with Verizon. Sometimes the independent dealers may offer you a better deal, but they are limited in their resources.
Making a scene is NOT the way to go. Unless you want your sales person to shut down, and write you off as a lost cause. If you did that to me, regardless of who you are, I would tell you I can't help you. Unless of course you have a valid reason, and present it like an adult. We can tell when your trying to get freebies. I have worked for both corporate and indirect. We know the game, in the end it depends on the store managers mood that day. If you want to rip someone call customer care. They will work with you, depending on your payment history and length with Verizon. I know a customer care manager at Verizon who just moved up here from Tennessee. They can do ALOT for you, WAY more than any store can. Its all about how you present yourself to them, and every call is recorded. Make a complaint if you don't get your way? It gets reviewed, cuss, throw a tantrum? Your done!
As far as the "Droid" (Google Android) platform goes. I hate it. I like the ease of syncing the iPhone, and built is MASS storage. The onboard flash on the iPhone is MUCH faster than any of the SD cards you can toss in an Android powered device. Each platform has is ups and downs. So, to each his own! I suggest trying both devices before you buy. Send some texts, make a call or two. Search for apps, etc...
As far as the new iPhone data plan, its grandfathered regardless of weather or not you upgrade until ATLEAST this time next year. Regardless, I think 2GB should be plenty, especially considering they don't allow tethering on that plan, and if caught, you pay per KB. 2GB is plenty for me anyways, I don't really go anywhere without WiFi anyways. I use roughly 200-500MB/Mo.