rwm,
Sounds like you and your company have got it sorted.Its an agreement that both you and them are happy with and obviously so are the authorities so therefore everyone wins.
It sounds like a very sensible and concerted approach to me and it is probably an example that some of the other less scupulous operators around the industry may look at following.
Good on ya