Well it's all done:
I had another go over the frets with up to 1500 sandpaper and I think it all plays very nicely.
The only trouble I've had is the highest couple of strings go out of tune a bit when I do bends, but I think I might not have wound enough string around the post to get it to stick.