If you like the car and Like the original motor, I don't see a problem with dropping the same motor in and saving yourself a lot of work. I bought my 535i for $2200 and it runs and looks great. It needed tranny mounts, struts and a driveshaft. I look for a car that needs simpler things to replace and is driveable while the upgrades are being made. You gotta do what's right for you though.