It sounds like the parties involved are doing the right things to resolve this issue. One thing though. I wouldn't wait and see. Keep hounding them. The squeaky wheel gets greased. I've taken the wait and see approach before and have been burned by my own inactions, being polite, benefit of the doubt, relying on others - etc.
