Sounds like a good plan, I'm happy with my oil pump, yeah Eric K. says to skim the heads. Your bike (and you) have a bunch of fans here so keep us posted. I almost have mine finished, painting soon. I used a Ninja 300 swingarm (20.5") that I did the reverse conversion, from mono to twin shocks. De-raked it to 24.8 degrees. Modest rearsets and a thumb brake for the rear. I'll send a picture when the time comes.