That's what i would suggest bro..go for a cheaper fix 1st..
i think the accumulator's part# is 21532229716..
Pump's part# is 21532229715
Call Bavarian Auto 03-40433888 to enquire the prices..at least you can budget..
you can also buy it from them and fix it at a reputable workshop
But, make sure you confirm the culprit before you buy it..