Thanks Steve,
I worked on the assumption that these items should be used.
My latest problem is that it appears that I have stripped the thread on the adjuster nut, as my bearings will not tighten up enough to be rideable. Will have to pull everything apart again to inspect. Perhaps the 6mm or so of upper bearing seat that protrudes from the steering neck in the new set-up has contributed to this issue. I had to find a thinner lock-nut washer to enable it to get purchase on the upper thread also.
Has any one had their steering stem re-threaded?
Justin