Whoah there lads before you change everything on the engine.
Get the mixture checked and adjusted, mine was running way too rich when I got it and caused exactly the symptoms you describe. Lumpy idling and everytime I dipped the clutch as I came up to a set of lights the rpm's would dive, almost stall then recover !