Personally I would go w/ a nice Chev small block w/ FI & w/o a carb but only w/ access to a good elec sche & diagram of the existing configuration .
I enjoy this original engine but don't know for how long w/ this game of Mercedes roulette .