Since it would require running new cabling I'm not going to do this.

 

While I personally believe it would be perfectly safe to do this, it sounds like it would require an inspection before livening to be compliant, and that's more trouble and cost than it's worth.