2004 R1150RS wiring loom disintegrating

I have a WELL CARED FOR 2004 R1150RS stored inside and low miles, but noticed the wiring loom tubing is crumbling..I plan on removing the wires from the bike and wrapping in electrical tape and then cloth wrap over that....but am open to any other suggestions, comments or better alternatives. Not sure about getting the wrap inside the plastic covers of like the turn signal switches and such, but was thinking of silicone at those points if I can't pop a cover off to get wrap inside the plastic...I 'm worried about extra stress at those points if not wrapped or something for strain relief.