When I did the clutch on my 99 I too used the Genuine OE
Yamaha clutch kit [friction disks and clutch plates] with the EBC spring. Price was close enough it was worth it to get the genuine. The OE clutch itself Is fine, it's just the spring that's the weak link and since you've already upgraded that, you should be fine with the Yamaha clutch kit.
It's a pretty straight forward job, I personally purchased the Yamaha clutch basket tool. If you have a big enough strap wrench, that will work too. The hardest part is the gasket, but if you've already done the spring, then you're familiar with that. If you don't have one, I'd *highly* recommend one of the 3M gasket removal disks. DO NOT use a standard gasket scraper, the aluminum case will not like it... Ask me how I know.