Richard Eberline is Rocket man, in Troy Michigan. He's rebuilt a bunch of Minarelli V1's for me, and most recently a Puch Swinger. He got my Swinger with a 1.5 hp motor going 35 stock, then we kitted it with a better cylinder and pipe for a rally and had it going around 42 mph. The guy really knows his stuff.
I was just going to mention a build he did for a guy in Connecticut, but that guy is the previous poster!
Ship him your motor and in a week or two you should be riding again. (edited)