^^ welcome to the forum mate
And i am glad you got yours sorted..hope you will enjoy your replacement car. I haven't bought my car from the dealer's BMW AUC, so i don't think what you have suggested would work for me
My only other option is to take out the BMW extended warranty
Oh btw..your best bet would be 6 cylinders..even the 320D has problems with blown turbo