I've found another set of indices which gives good performance with both
queries. I'm now looking forward to keeping a careful eye on them to
make sure things don't change for the worse as I optimise other things!

--
Tim Ward