Yes that sounds right!And to undo the bolts put 2 wheel bolts back in the hub and use a breaker bar to hold the hub while you crack off the bolts. Will need an extra pair of hands though.
Or get someone to sit in the car and press the brake pedal.
You sure its M8 and not M10. Most 1.8T's and 1.9Tdi's are M10.And yes they do but its called a spline Have to buy a set though.http://www.halfords.com/webapp/wcs/stores/servlet/product_storeId_10001_catalogId_10151_productId_168943_langId_-1_categoryId_255215#tab1Saves you taking the M8 back when its the wrong size.