Have you tried more main jet as a test to see if the area that you suspect is too lean really wants more fuel? I'm not saying this will be your permanent fix but it might help determine what the motor wants first, then you can come up with a strategy to fix it.