Would you mind giving the name of the shop you used? I must admit I am also wary of the dealer, but they did a R/R replacement under goodwill in April - long before the bulletins, so I am still prepared to use them for 40,000 km service coming up.
40000km is also a B service if I am not mistaken so its also shims etc, etc. Triumph w/shop mgr told me not to expect much change from R4500 for the B service, since I do everything except valves, throttle sync, & plugs, that is all I needed to outsource. Danie Maritz racing 0215565914 got the nod, <R2000. Check out their website or better still go & see for yourself.
The other good one is Superbike solutions in Som west.
I had my valves checked at 12k and all were fine except for two exhaust that were barely out of spec. If you take care of your engine - let it warm up correctly and don't beat it to death you should be fine. I will probably not need anymore adjustments in the future.