The water pump has never been replaced but the bolts heads look like they are worn, as spalled. May need to carefully tap 6 mm driver into place. I will use your valve lapping compound idea.
96 C280 Mercedes
82 Rolls Royce Silver Spur