Have you filed formal complaints with the Attorney Generals office in CA? Have you posted on the Santa Rosa BBB website and filed a complaint? You don't explain mileage or warranty issue with the dealer upon purchase? Who changed the water pump? When did the X show smog codes? Remember you can post on various website about this dealership. As for BMW NA I had very positive results with my x5 3.0 days after Carmax purchase and I discovered torn boot. BMW Nashville claimed it was under warranty and changed it free of charge. Perhaps a 3.0 would have been a better choice, have you discussed exchanging the X for a different X at the dealer? If all else with the car is solid and you can afford a rebuilt head (BMW Recycle-Sacramento area) keep it and plan on the expense at a later date. If not dump it. BTW, when did you discover the warped head?