Originally Posted by dabnis
If you want to keep the electric solenoid you might want to check VW diesel parts. I had one fail and, IIRC, it was a separate unit that was easily replaced.
This might be especially true if Volvo uses a Bosch injection pump - the solenoids may be the same and any VW diesel would have one. Our VW setup looks quite different from the one pictured in my previous post, but that may not match the OP's engine either...