Re:
Progress was made this weekend.
I decided to do the headset myself, properly, with the correct tools. So the old one came out with one tap, and the new one pressed in straight and true after a bit of juggling with the tool. Because the head tube is so long, I had to do the top cups first...