I decided to build up my spare engine

I created a thread about this a few weeks ago, asking if I should use my spare engine for parts and build up my current engine, or build up the spare and then just swap. While it'd be most logical to just build mine up, I decided that the most convenient option will be to just build up the spare, as everything that it needs done to it is something I would do to my current engine anyhow.



Now, I want to know if I have the right idea of what all to do with it. I want to make it as perfect as I can. I know that these engines don't take kindly to modding, so unless I find some easy mods that have little risk to negatively affecting my performance, it'll be a stock rebuild.



So far, my list of things to do/get is:



Gasket Kit

Mechanical Seal

G8 Stator

Cam Chain+Tensioner

Piston Rings

Lap Valves

Inspect entire engine, and decoke everything possible.

Clean out and/or replace oil pump

New clutch kit, if current one isn't serviceable





Is there anything else that I should consider, or did I pretty much nail everything?



Oh, and there was a bit of rusty water that came out of the cooling pipes when I removed the radiator. I was told that this can be flushed out after the engine is rebuilt, and put back on the bike. Is this true, or can I get it flushed out before putting it on the bike, so I can get it "perfect?"



Thanks for the advice. This is still a bit off in the future...but the first thing I'm going to do is get the heads serviced (the valve lapping and whatnot) and get my gasket kits. Then I'll slowly do everything else until it's ready.