I can confirm that as long as you bring your own device for activation then you will retain your unlimited plan. I purchased a RAZR Maxx on eBay about a month ago, activated it on my account, and retained my unlimited data. Hope this helps.
Did you do the activation on-line or over the phone, or in a store? I'm doing the same thing, and it's not letting me activate the Maxx online.