Well, I was right.
Getting rid of all the trashy wiring didn't solve the draw or short problems. In any event, the mess is gone and the radio cage is in. It doesn't fit. Oh well. I'll have to take a careful look at what exactly is causing my problems.
I have this sinking feeling that whatever it is that's shorting out has also blown all the bulbs that don't light, and the security module...