1 hour? you done well.
Its easiest to remove the driveshaft complete.
Loosen the hub nut, remove the inner flange spline bolts.
As already stated, remove the bottom balljoint to give you enough room to get the driveshaft out of the hub.
Now the hard bit, every mk3 gti/vr6 i have worked on, i have needed a puller to remove the shaft from the hub.
On the plus suspension locktite was used, and its a very tight fit.
Once removed, cut off the old gaitor. The joint will come off when you hit it with a rubber mallet, best to clamp the driveshaft first.
Keep a note of the position of the washers when it comes apart.
Re-assemble, then refit the shaft.