Certainly completing the migration would be the best course and then yes, moving the floaters. You wouldn't have to remove the automap but you wouldn't need it anymore I'd imagine and then at least you'd see real IPs in the server logs etc.
The automap is ensuring traffic coming in through the new pair gets back to it, as far as the servers are concerned they are responding to a device on the same LAN and the default gateway isn't used. Obviously a traceroute will point to the old pair as you haven't moved the floater that is the DG.
So, complete the migration, move the floater(s) and then disable the automap one VS at a time and you're there.