sorry to be late on this, but have you considered import car centre's service place on campbell off carling? i always got my 540 serviced there. never cheap, but always did a great job.
EDIT: I had the wrong name. This is them:
http://importcarcentre.ca/index-4.html