Sean, it sounds like you have a pretty good handle on things. Agree, swapping the OB's is a good idea, and having the boat handy where you can work on it is too. Best as you go.
Looks like you get her home in fine style. Maybe a bit of adjusting to the trailer to come yet. I saw you already have that thread going. Best to you and enjoy that new boat.