Hi
You can definitely keep your grandfathered features when you update. If you're still having issues with that, it might be a good idea to stop by your local AT&T store to do your upgrade there. Or contact us by phone at 1-800-331-0500 or by private message here.
Thank you,
Dmitriy