As Russ says, make sure the basics are right before you start chasing that problem with jet sizes etc...otherwise you can end up running down the wrong lines all the time, you'll go crazy!

As the choke is now clear, give the bike a good run on new plugs and then see about the tick over issue...lumpy tick over is often caused by air leaks (i.e. choke issues). I think it may be fixed already it may just need a good ride out!!