ec 300 2012 jetting (needles)

[sheepy]

ive just done a full engine rebuild and after a few rides thought it was running a bit lean it was overheating blowing out coolant and pinking. so i pulled out the carb as1 and found a 170 main jet, 40 pilot, n1ef needle on top clip, air screw 3 turns. so ive put it back to the standard 42 pilot, 175 main, n1ef #2 and air screw 2 3/4 turns. and i find that it is to rich from around 1/8 throttle all the way to wot. i understand 2 3/4 turns is to far out should be between 1 and 2 for best results so going to drop back down to 40 pilot. but for the top end was thinking of running a different needle either a n3ch or nedj do you think they will be suitable with the current jets? will be used in-between 50-2000ft