I was told not to use aftermarket. For reasons I forget. I purchase stuff from Bavauto.com. I will Call them tomorrow to see if they carry the parts.
Bavarian Auto Sports.

Also I was told to remove the engin cover and against the fire wall their is a hose that goes bad and might need to be replaced. He said it gets really soft.