I'm back - a few days in the Alps without a PC did me the world of good.
A solution to this was implemented, but due to one detail I missed (the claim has to be made as the repetition occurs) I pulled the whole thing.
I am now set to re-implement this correctly. And it really is top of the list - the next bit of work I do.
-Russ