Thanks - will have a look again for the shims. It's a possibility I didn't spot them. I'll see if I can remove the air filter on the WRD. It does seem to be letting air through though, as it makes quite a loud sucking sound.
I don't have a gas tester, so can't really tell whether it's running rich when it's warm, but I've pulled the plugs, and they're a nice brownish colour, so I'm guessing its OK. That said, it does kick out a bit of smoke when I floor the accelerator. I have checked the linkage according to the 'linkage tour', checked the ignition timing, and adjusted the valves, so I'm running out of things to check. The car has only done 80,000 miles from new, so I'm thinking it unlikely that things will be that worn out.....
The most annoying thing about this problem is that I only have about 10 minutes to do any adjustments before it warms up.