Rich,
I can't offer solid advice on this issue other than to share my experience. I think the wires BDM chose are an "off size" meaning non standard (8.8 mm I think), many have tried to change out wires and there have been mixed results. When I changed mine out, the bike immediately began having issues where it would just die. I would still be rolling and simply turned the key off then back on and refire the engine and it would run fine for another variable period of time before it would happen again. I finally gave up and went back to stock wires with much better results. I would do the maintenance work and run the bike to make sure all the work is fine then change the wires so that if you do have a problem, you can isolate it directly to the wire change out rather than thinking something else is wrong (like the EHC might be bad.....yada, yada)