The first thing you need to do is get her out of that filthy tank. Clean and disinfect it. Any stress caused by handling her will be relieved by her no longer living in squalid conditions. I'd return her to it with a couple hides, a water bowl she can soak in and some cover. I'd use paper towels for substrate. This is just temporary until you can get the equipment you need for a proper set up.
For her long term set up, I'd try the 36 x 18 x 18 first. You already have it. Many keepers struggle to maintain temperature and humidity in glass enclosures, but they work for some people. If you haven't already, get a thermostat to regulate the UTH. No heat source should be unregulated. You'll need a heat lamp too unless the room you keep her in is really warm. This forum has a caresheet with more information on the proper set up.