Ehen you are in there replace everything you can. Unless the non dealer gives you a warranty and has done a bunch of them I would go back to Subaru.