I did mine differently, and cut out all of the safety relays and diodes along with all of the street stuff. Because I got rid of that stuff, I had provide power to the starter relay differently etc. I also wanted to make sure whatever I did was easy to repair at the track, so I made changes in the harness, so I could just swap out components.
What you did sounds reasonable, but like I said I don't have a print in front of me.
My bike is a 2000, but I think 99-02 wiring 99% the same.