Installed the Factory Pro shifter kit and it seems to have solved the problem. Ran the bike pretty hard at Harris Hill today and it did not down shift or pop out of gear one time. Crossing my fingers that this problem is gone for good.