Maybe have a closer look at the relays ( OVP & fuelpump )?
I've heard soooooo many stories here about cracked solderjoints inside of relays, etc.
Could be worth taking it apart & inspecting it ( burned contacts, cracked solderjoints ).
At this point I don't want to tell you to " jumper " anything.

__________________
2007 C 230 Sport.