Sounds like a plan!
By the way, my UTHs are stuck to the bottom of the tank using aluminum tape. I realized that the sticky that came with the UTH is a pain in the neck to remove - especially in cases like these when you get something defective, or when you need to upgrade the tank. Just thought I'd mention it.