Move existing messages from gmail account to new one, set up a forwarding rule from gmail to your new address for everything, change accounts as they show up. Maybe a bit longer route, but far easier to swallow since you don't need to go trough all the things in one go nor worry if you've missed something.