I just came across something that may be of interest when redoing all that wiring. You may already know this. I was on Wikipedia looking at something and this little paragraph...
Non-dyed silicone rubber tape with an iron(III) oxide additive (making the tape a red-orange colour) is used extensively in aviation and aerospace wiring applications as a splice or wrapping tape due to its non-flammable nature. The iron oxide additive adds high thermal conductivity but does not change the high electrical insulation property of the silicone rubber. This type of self-amalgamating tape amalgamates or fuses to itself, so that when stretched and wrapped around cables, electrical joints, hoses and pipes it bonds into a strong seamless rubbery electrically insulating and waterproof layer, although not adhesive. As an electrical insulator, silicone rubber has the added virtue of remaining non-conductive when damaged by heat, reducing the likelihood of runaway arcing.
So looked on Amazon, its right there. I myself may never use crummy old electrical tape again! Or that melt on insulation tubing.