Looks like you're right, the solenoid & valve stem were covered in oil. Given that the valve is OK, presumably just a case of replacing the O ring?
Given that the locking nut sits it a recess on the pump body, what's the best way to remove it, box spanner? I did find the knurled nut that locks...