Apple Contacts - Change Japanese Address Format

I have several Japanese addresses in my contacts. If I add a new contact and select the format for Japan, Apple's Contacts suggests a format that doesn't seem to have been used in years, and which does not match the format used for addresses I've found on all the Japanese company web sites I visit.

Is there a way to set up a custom address format in Contacts? If not, is there a way for Apple to update the Japanese address template or at lest add a new template that matches current address formatting? If the above two options aren't viable, is there an existing address format that is most similar to that used in Japan?