I would take it to a different dealer from the sounds of it, sounds like a(expensive) pump problem, but could be loads of things.
tabetha