yeah KYB's are a marginal upgrade.
the rears can me replaced with a more universal shock though since they dont have the spring attached. i was going to use adjustable mustang 2 front shocks.. but need to measure the width of the mount and diameter of the piston rod. also i was looking for a comparable sport shock.
for the front i was going to cut down a front and the pipe thread it it accept a vw cap. and put mk1 or mk2 bilstien sport inserts into it (which ever was correct length but a little shorter than stock) and also possible more the spring perche down the body of the shock.
this was all before i found how close we are to the new astra in suspension design, i am trying to find used astra parts to test fit, then i could just buy coilovers for $620 shipped.