That amount of space is a huge improvement! That should help a lot. I would ditch the National Geographic stuff though. Based on what I've tested it's not very good quality. Get a nice UVB tube and a basking bulb for that enclosure though and you should be in business for sure =)
It looks good space wise. As I mentioned in the other thread I wouldn't mount the lights inside the tank because they are quite close and have potential to cause burns. It's best to have all lighting overhead to help with self regulation of temperature and UV exposure as well. If you don't want the lights on the top then I'd build some kind of structure to mount them above the tank. I use lamp stands for my dome lights. here's a photo that may give you some ideas on how to mount them.