Same with when I bought my Touch Pro2. Grandfathered in at $100, but NE2 is definitely $50 from here on out. Honestly though, I don't blame them. Until my TP2, smartphones were historically $250-$300 with a 2-year (after rebate), and now they're $200 almost every time. It all works out in the end, so I won't be waiting for my NE2 anymore.
This time around though, I'm going to hold out and see if any new rumors are on the horizon by late September. If not, I'll probably go with the Droid 2. Now if Moto wants to release the Droid 2 in time for my trip (beginning of August), I'll probably jump on it for something to play with while I'm gone.
Here's a question though. If you use the annual upgrade, don't like the phone, and return it, can you use your annual upgrade again, or does it get forfeited?