since its a 2e, any of the 2.0 8v lumps can be fitted. the difference is the later ones have a crank sensor, which isnt used on the 2E. just dont plug it in! apart from that base block and heads are identical. Just need to swap your old 2E dizzy into the later block, and various bits like inlet etc.
not really a hard job, unbolt engine drag out with crane, swap over whats different and chuck it back the same way. clutch deffo should be done while engine is out, madness not to. get a good quality sachs clutch kit.
however I'd be suspicious that the problem happened right after the timing belt, I wonder if the timing is messed up. dizzy is easy to move when belt is off so might be that