no need for a chocke with a cold engine, indeed indicates a rich situation.
if it's obvouisly running rich on the bottom, i'd try the 40PJ anyway.
does turning the airscrew have effect with the 42 PJ? if not go ahead and put the 40 and be amazed
put on a closed helmet ,rain coat and pants an go out testride :-p