Did a little bit of looking at the Merc M120. It certainly acoustically sounds better than the Toyota but has the same problems. Its a front sump with the pump under the engine. Also there is no easy/documented manual swaps.
Not sure where to source that engine, they appear more rarely than the GZ. Also, Merc parts $$$ :/ Ill add it to my list for further research.