I think I must have done something wrong - I did all this but DRM was still in place. I've decided just to do it the hard way - I've kept my current library as I still have the Voyage (although I doubt if I will use it) and I have created a new library for the Paperwhite and will just download the books again but for the paperwhite.
Its not the end of the world as I do quite enjoy cataloguing my books and customising the metadata
