The only guy I trust with my bikes is Rudy Kudtz of Port Magic in Hesperia. It's a drive to get there but he is a "Two Stroke God", builds the fastest most reliable motors around and he is very reasonably priced. Not sure if it helps but tell him the guys from Montclair Yamaha sent you.
Port Magic 760-244-8834
Good luck,
Chris Mock