Just go Dinan. Doesn't have to be factory installed. Dinan matches BMW warranty and its so "trustworthy" that a few dealers in the US even have baked them into lease payments. Stage 1 installed here and its freaking fast.
And yes you can use the Dinan app and via bluetooth turn the module back to stock on the fly.