OK, I'm glad you said that. I thought I must just be completely daft and missing something simple.
I'm going to throw this back over the fence and see if I can get them to fix things on their side. I've wasted enough time and I don't feel like regex'ing a big mess to try to do this :)
Thanks!