You have a lot of patience. I would have just replaced the whole faucet. I'm amazed you were able to find the right replacement parts.