I cured mine by removing it and putting it in a box in the house. Hasn't bothered anything since
I tried replacing it at first with a unit off ebay which worked for a week or so and it was back draining the battery again.
Went to an aftermarket radio and ditched the tcu was the final solution. That said your idea of making it key switch would be a good solution.