Dawntreader, your pictures are awesome. Please, do share the model of the camera you're using. I'll write to the sponsors and have them send one to everyone who signs up with the e34 forum.
Swop in an m50 or an m52 engine. Don't bother with the rebuild. Turn an expensive repair into an upgrade. M60 engine would be great too if you can get a hold of it.