The eibachs will do the job fine, common problem with mk3s, the front springs are far too soft.
As for your lumpy tick over, check all the vacuum hoses around the throttle body, and check the vacuum hose that goes in the fuel pressure regulator.
Also check the timing.