Stick with it Dennis, I'm sure as a dissatisfied customer you could bargain more extras out of them.
The problem I feel the old car and it's problems are still stuck in your head, if BMW can fix the Oil leak then let them do it.
Providing they furnish you with a replacement car during the delay of fixing.
You'll love the car once you get out motoring again
Rams