i wouldnt go to the same mechanic for this issue.
spend the hour's labor at the dealer. let this get fixed once and for all. nothing u want to take a chance with.
keep us updated.

__________________
Whether you think you can or cannot, Either way you're right!. by Henry Ford.