G15 or G16 would work well and fit with minimal alteration
However
An M series engine M15, M16 or M18 will bring it up to date. However that route would involve more work and the car may take months to become totally dependable
Simple answer, if you need it back on road asap, get g15 or g16 , if you have time on hand and like to mess around, go for M series.