I had adjusted it with a timing gun (6 degrees advance). Z mark centered @ 3500 like you suggested and that helped tremendously. That required me nudging the "can" counter clockwise.
So today I nudged it a bit more in the same direction and that corrected the problem. I didn't use the gun but the Z should be above the notch now. How much, I don't know. I may check that out after riding it for a few days. I also want to monitor my gas mileage and spark plugs.