You shouldn't need to do the takeover/givebacks. That was more a 7mode thing.
You should just be able to move the lifs around, add new lifs and reconfigure/add vlans. Just be sure to evacuate any port/ifgrp you're working on.
After your done, be sure to verify failover groups on your lifs.