Looking for M50/M52 for e30 Swap

What I need:

-clean motor (one of us is going to test compression before the purchase)
-all accessories working - that means alternator, PS pump, alternator
-includes engine harness
-includes intake mani, throttle body, intake stuff
-prefer to have e34 oil pan already(ie pulled from a 525)
-OBD1
-if you have the ECU, MAF, intake, ect that great but its not a deal breaker.

I prefer the NV M50, but I will consider all 24V engines.

what I dont need:
-transmission
-junk engines
-non running engines
-engine parts

Price range is 300-400 for just the motor and stuff listed above. I am hunting on my own but figured i would put this here in case something slips through my searches.

Note: if you have an e36 parts car I might also be interested, as I can probably take the engine and part the rest of it myself in that case I am looking for a <$700 car.