Why would you want the same engine? I would look at re-powering it with a turbo OM617 and you should be able to move with traffic at decent speeds...

Dkr.