Yup Tunedub or Calgary Auto Works are the way to go for sure.

I know some will ref lash their car to stock when taking it to the dealer. Then re-flash their tune afterwards.