I think the obvious solution here is to store your contacts with the country code. I believe you can also append it to contacts after the fact and it will update the iMessage thread. If you travel or have contacts out of your country, I find this to be useful.