Okay you have proven to yourself that the main jet that you have without knowing whether or not it was altered is significantly leaner than the stock jetting. I think the best thing to do is to install the standard 152 and a half, or a 150 or a 147 and a half. I suspect that if you change your stage one needle for an original needle that the bike is going to behave better. If the pilot air Jets have been changed then you probably will need to swap them out as well. I bet that after you make the switch to 152 and a half, 150, or 147 and a half, that your air screws will be able to be screwed out less then the three and a half to four that you said you have now.