A good rebuild can cost a lot, especially given oil starvation. Lots of bearing surfaces need to be checked out. I'd look for a used M42 from an early E36 with a manual tranny. They're common and pretty cheap. Earlier model M42 (<'93?) swap right in, with a few of the E30 parts. Later models of the M42 ('93-'96) need a bit more work, but can still be used if you swap over a few more parts from the E30 motor. IIRC you need the oil pans, motor mounts & arms, intake manifold and the correct belt drive system. The E30 computer is simpler, has none of that Bosch EWS business, and the E30 harness will run a later M42 with a few sensor & wiring tweaks.
An M20 swap would work out too - those motors are still pretty common. Be aware that the E30 M42 & gearbox (Getrag 240) are angled differently than the M20 & Getrag 260 combo. A few guys on here have used the tougher Getrag 260, just bent or welded the shifter arms & tranny subframe to compensate. The M20 flywheel is lighter than the M42 version. Be sure you get the late model FW too (after mid '87 production date?). The ring gear on earlier E30s has a different tooth pitch, and the late starter won't work with it.