don't fit mk2 shocks on the front as i think they give too much negative camber as the mk2 has a wider front track.
in my opinion i'd be looking towards koni or g-max set of springs and shocks. and fit a rear anti-roll bar & good quality tyres. Poly bushes make a huge difference and well worth doing.
hope this helps.