mid 2010 they issued a recall (using a single relay only to divert the load away from ignition switch) for 2010 model Roadsters but did not recognize the earlier models as having the same fault al though in many cases provided new ignition switch to those that fried, The recall only partially cures the problem as it redirects the the heavy load on to the dipper (Hi-Low beam) switch so it will eventually likely fail, In my Opinion there is only one answer and that is to either get a EB kit or make your own as I tried my best to keep simple in a thread I started
http://www.r3owners.net/threads/home-made-eb-headlight-relay-harness.19364/
I used your Cure and made my own relay kit to correct the problem in my bike It worked great. The relays, time and materials I used plus the size and the amount of space they took under the tank make be think the the EB Kit would have been better. I did it your way just because I could.