He is awefully cute, I'm so glad you saved him! It looks like you are definitely in the right direction, his setup will definitely do temporarily, especially considering his husbandry before you got him. You didn't mention a thermostat for the UTH, but I'm sure you have/are getting one for it right? They get much hotter than most people think..
Anyways, I hope to see an update in a couple weeks!
edit Also if you are keeping the tank, it might be easier to get some black Con-Tact paper from Home Depot, it's only $6 and will be much less effort than electrical tape lol. I admire the extra effort though!