That sounds exactly like the problem I had with my Beetle years ago. It was the filter in the tank. It was collapsing. I replaced it and it was all good again.