In reply to Rog Wilko:
Some interesting suggestions there Rog, they all look worthy of checking out next time I am up in Pembroke. Most of the routes at Saddle Head blur into one in my experience, but I've not done Wetstone. Sheer Delight does look good, might replace Caerfai Crack to broaden the range of crags. Likewise could get Rusty Slab in as a VS, and remove Joybringer (similarish to Gone with the Wimp?).
Noticed that The Hole at Trevallen is actually E1 in the new guide, so perhaps that needs replacing as well if I'm being strict about using the CC grades (they do seem a little soft in places).