I'm no jetting guru, but it sounds like you're about right.
If I were you I'd drop the needle one clip and see if it improves, then go from there.
The needle jet controls the fuel from about 1/4 to 3/4 throttle, if that's where you're encountering problems then needle adjustment is the place to start. If you're trouble is in the 3/4 to wide open then you need to look at the main jet. The pilot jet controls from idle to 1/4 throttle.
To change the clip position you loosen the band clamps on the boots at the front and rear of the carb so that you can twist it enough to access the top of the carb so that you can remove the slide. Remove the top of the carb where the throttle cable goes in, pull it off slowly and the slide will come out along with it because the throttle cable connects directly to the slide. There will be a brass needle poking out from the bottom of the slide. You'll have to sorta figure out how to get the spring and other hardware out of your way on top of the slide just as if you were going to change the throttle cable. Once you get the top of the slide cleared out, you'll see the top of the needle down in there. Now just push the needle out through the top and notice that there is an E-clip on one of several notches. To lean out the fuel/air, move the clip to the next higher notch so that the needle will ride that much lower in the carb when reinstalled, allowing less room for fuel to go around the needle. Do the opposite for a richer mixture.
This may seem complicated if you've never done it before, but once you have, it'll only take five minutes the next time.
Good luck.