ignition timing issues

I have a -89 mk2 Golf that lost it's timing during a waterpump change. We managed to time the crank- and camshaft but the engine wouldn't idle and started rattling during acceleration. we suspected advanced ignition but it's hard to adjust the timing without idle. Any suggestions?