X2 - keep the heat down, remove everything.
I'd use silver solder.
You'll have to check the gear end-play and surfaces for parallel. The relief valve must move freely with no effort.