All very good observations. Having never done the swap I'd not gone that far into the pros and cons. Looks to me like you're heading the right direction.