If you do Brow Gill to Calf Holes do carry on upstream after the daylight shaft of Calf Holes; there is a decent length of passage that ends in a small chamber. Birkwith benefits from a wetsuit, Old Ing is worth a look though quite short.
It's not that far from Dentdale to Birkwith but if you prefer something nearer and you choose Ribblehead you could have a look in Black Reef and Katnot (here -
http://goo.gl/KIIJ9i and here -
http://goo.gl/ZQl32j) which I think are better than Thistle/Runscar. Roger Kirk is a good little trip if you can find it. Black Reef is a narrowish slot in the field so may take a little finding, and there is a short chest deep bit in the entrance but then there is some reasonable cave. Not too far in is a climb up to a crawling passage on the right which is worth doing as a well as just following the water. Go as far as you can, it will either get very wet or just close down. Katnot is a decent sized entrance up from the river bank which goes down to a long crawl in the stream IIRC.
Given good weather your plans sound fine, have fun.
BTW, I'd do Brow Gill and Ibbeth as they are the better trips IMO, both can involve a bit of climbing and route finding interest.