Up until February 1st it was a toss up for me, and I have bought from both regularly but I did favor Amazon because I used an Amazon credit card and got a nice kicked back in credit for future purchases.
As of Feb 1st, Amazon started charging me tax. I cannot tell if it is Federal or state. B&H does not charge me tax, at least not yet. The only thing I can figure is there is an Amazon warehouse in my state/county. Sorry to say but I will not be making anymore large camera purchases from Amazon as long I can buy tax free from B&H. It is a pity because Amazon's service is fantastic but so is B&H. I've had such bad luck with Adorama (3 problems out of the last 4 orders) that I don't plan on giving them another order. So for me right now, B&H is my single source for major purchases.
Either Amazon or B&H are excellent, you can't go wrong with either. I would run the items through your cart to verify what the final price will be. Congrats on the upgrade, exciting times.