Hrm, okay, you've given me a lot to chew on here. I'll do some playing around in sandbox and see if that could work instead. Maybe drop a support ticket on the existing thing, just to see what they say