My sack of lemons....

I think you're doing right. This will be a major upgrade in power for you. Sorry you got the bad end of the deal on the 6.1. You'll be glad you made the swap once complete.