OP- You should consider having the dealer add a CPO warranty, given the fact you are using a dealership.

Agree this one seemed somewhat option poor.

Yes, you could add nav and the full 'cic based' idrive to this one, but it would be $5-6k or thereabouts...and you'd always have a 'bastardized' car that the dealer would likely whinge about if you ever needed service