Jetting help advice please

As the title states looking for some jetting advice

For my YZ250 1987

Fresh rebuild, entire engine new, no crank seal leak, used yammabond on case halves etc

The bike runs really well apart from a fair amount of unburnt 2 stroke oil in the exhaust and bit of a weep from the silencer joint its not major but its enough for me know that something is a little off

I suspect its a little too rich

The needle clip is as high as it will go (needle 6F16 stock needle) the needle clip was one from top but i have since moved it right to the top

The jetting is completely stock (350 main jet, pilot jet 30)

Pilot airscrew two full turns out from fully seated position (recommended by clymer manual)

Im running the pro circuit works front pipe with FMF silencer

Im running 125ml of 2stroke to 5 litres(40:1) of shell optimax, clymer manual recommends 20:1 premix but that seems a bit much with todays modern oils?

Here is the 2 stroke oil im using currently

http://www.ebay.co.uk/itm/SILKOLENE-COMP-2-MOTORBIKE-ESTER-INJECTION-OR…

Any thoughts advice lads ?

Change 2 stroke brand, run less/more oil to fuel ?

Any help would be greatly appreciated