Not gonna be sending my old motor back Dan, the warranty is not worth anything. Obviously not covered for water ingress which is to be expected. But not covered for electrical problems!

If the motor does pack up within the year then they will obviously argue that point, either drive the car up to them or get a BMW tech to do a report and we know how much that would cost.
They get ours back recon them, give us £30 and sell them again making @ £200 off each!
So i am getting my old motor reconned for, i have been quoted @ £40. And then have a spare motor just in case.