Along thread with some implications for you
and others with "improved" Universal engine wiring.
Bonnie, the thread is very long, but you may enjoy reading all of it. My conclusion was that the improved wiring arrangement is not necssarily an improvement. I do NOT know what you have on your boat, but it seems similar.
The Napa fuel pump is just a pump, and on our boat it has no solenoid, just the key switch turns it on, as well as energizing the cockpit panel switches for the glow plugs and start buttons.
The glow plug solenoid has become, I understand, a standard on the later engines. It was not made with the M25 engines, and I do not know if they came with the M25XPBs. I'm pretty sure they now come with the newwer M35s.
Only you know what you have on your boat, I was just pointing to two resources for you to consider which may be applicable to your situation.