get rid of the riva pipe, port and bore your existing cyl and use a B pipe or..make sure you are propped correctly and it will make all the difference in the world...
if you can twist your stator 2-3mm CCW you will also be VERY pleasantly surprised..