Your definitely making the correct changes. Your numbers are falling right into place.
I would suggest that you tune the part throttle until it "feels good". I played with mine from low 14's to low 13's and it felt better/crisper in the upper 13's to 14.0. Your low to mid 12's (part throttle) is where you might end up for a WOT reading, so once you lean the part throttle out your WOT will go even leaner, so be carefull.