IMHO -I would get someone else to take a second look before I decide to do an engine swap. It's probably something right in your face that you're overlooking...
'03 745Li (sold)
'03 Acura TL-S
'02 Infiniti QX4 (sold & new owner totaled it 4 hours later)