Checked the carb, it is a 30n 3-1 for sure but it only has one adjustment screw a large one to the right rear, the other one you mention may be under a blanking cap.
I had the needle in the middle position for the last run, checked the plug, very clean so I thought it was running weak and moved the needle to the fourth position to richen it up a bit (this is where it was when I first got the bike).
Just been on a run, it does seem smoother and pulls better from lower down, cruising seemed improved and the over run had a less surging but still some.
I am no sure how to get the tickover a bit higher, the charging light comes on sometimes when the tickover drops a bit.
I can't find any good position for the large adjustment screw (air feed?) that lifts the revs high enough, I have got it ticking over about 1100 but can't get it higher.
Will check the plug tomorrow to see how it looks.
Got to say..I am very impressed with the smoothness of the suspension, took it over some very rough badly patched roads ( some Edinburgh roads are like the third world) it felt smooth and stable, and still handles very well around corners, if this had a torquey engine it would make a great off road bike (apart from the daft position of the clutch cable entry) really happy with this bike