If the country picker is turned on for a form, the country for the phone number entered should be auto-updated for the contact. Right now, the location of the sub-account is used as the default country. Adding a field to the form for the contact to select their country would not solve this, as obviously they could select any country.