Ok, replaced the brake switch and so far seems to have fixed the problem. Drives like a different car. And every thing works as it should. No surging. Will keep you posted!