reet, mk3 1.8-1.9 shafts are what you want, basically lump larger than 1.8 but still with 4 stud. mk3 cabbies will also do the trick, they often have 2.0 lump in but are still 4 stud.
edit: 5stud mk3 shafts will work at a push, just need to swap outer c/vs for mk2/3 4 stud ones.