Yes, that might be a better way to do it, my issue is I really don't want to do something "special" with the inbound route, as if I do someting else, I need to remember to fix it again.
Is there something I can get the trunk provider to change, or something I can do with the gateway definition...