You're doing the right thing not accepting the car back until its right.
These dealerships are just not able to operate to the standards required. The complex high end products they sell exceed their abilities to service and repair.
The mechanics and bodywork guys are just kwik-fit monkeys, no clue about the care and time required to do a proper job. People who are good at it work for themselves or an indy these days leaving the dealers with the leftovers...
Keep up the pressure on BMW UK.