Applefan - I did think the China treaty covered HK, at least that's what our tax guys told us. I've been able to take the exemption and tax credits for last 2 years from here. In any case tax law is royally confusing and we may both be right!
WSinHKG - Good luck with the move. I think asking your company to run both scenarios is a good idea.