I gave up on fixing this myself and turned the car over to my local vw shop, they adjusted the timing, changed the plugs (the ones I had put in wasn't the right ones :embarassed:) and the plug-wires.
They also told me that there was a leak in the intake manifold gasket, and that they would have to remove the entire top in order to change this gasket, wich seems like a bit of an overkill in my opinion.
So I told them to leave the gasket for now.
The car seems to run much better now, but sometimes it jumps up to 2000rpm when idling, but only for a couple of seconds.
Is there an easy way to tell how major the leak is, would spraying some carb. cleaner/ startspray etc. on the manifold gasket reveal how serious the leak is?
By the way, there always seems to be a bit of oil gathering on top of the intake manifold, is this caused be the leak?