No reason to ever go back to the dealer now that the warranty is over. They overcharge for parts, and labor, and quote you book hours.
Try Motorcepts in Richmond hill.
They only work on BMWs. They've done great work on my x5, 335, and z8