If you do decide to try Castle Combe again this year I am definitely in.

I have booked all the Castle Combe trackday dates off this year (except for the one preceding the race meet as that is always full of racers) in the hope that I will be able to make 2 of them in decent weather

Anyone thinking of trying a trackday I can't recommend it enough. Forget the 'track' bit of it, it's not racing, it will though teach you more than you can imagine about your bike, and your riding. I'm sure I learnt more in a couple of trackdays than I ever would have done on the road, some of the stuff I learnt I don't think I ever would have twigged, period.