May be I am late here but what we ended up is using the solution from this link :
Bind your address fields on the form as single line text and then open XRM toolbox and update them using the link mentioned above.
Thanks
Thanks Manish, I already used the same to resolve binding issue.