Going through and doing this yourself, and being picky about the adjustment, you are going to get those clearances Spot On. Odds are if you had taken it in, not many shims would get changed if any, sad but true.
Since its your bike, and can spend the extra time to do it correctly, you will end up with much better results. By the time your done with your service that bike will run really smooth.
Personally I would keep the Bucket/ Tappet against the same lobe, so to keep any wear pattern in tact, .02c