Thanks @wammers I'll give those a go.
By the way, is there any way to tell if spigot rings are the correct size? they fit into the wheels fine, but they didn't seem particularly tight on the hubs. I'm 99% sure they're fine, just that niggling concern in the back of my mind that my wheels are...