By the way I have the same frame, and it also starts to squeak at the headset after getting water down into it. Taking the headset apart like you did, cleaning and regreasing it, and reassembling it always fixes it back up.