The point of where I was going with a suggestion is that you should have a talk with the electrical inspector, and possibly the fire inspector before you plan any repairs.
Discussion regarding what is acceptable, and providing details (sketch) is a lot easier than doing something & not having it approved.
