Generally any OM617 will work with that car (it is what came with it), the main differences are either NA/turbo as you mentioned, and some had california emissions, but can be eliminated. 1985 brought some changes to the surrounding systems as well. You'll probably want to stick with a turbo 617 or face the curse of extreme slowness. Should be a fairly straightforward drop-in. You can go with a newer engine if you have the swap cars side-by-side but more things will need to be swapped over and adapted.

__________________
TC
Current stable:
- 2004 Mazda RALLYWANKEL
- 2007 Saturn sky redline
- 2004 Explorer...under surgery.

Past: 135i, GTI, 300E, 300SD, 300SD, Stealth