IOS 5 Update Issues (contact numbers, m4r files, photo library)

Question

Right after updating my iPhone 4 to IOS 5, I encountered the following minor issues:
1. Most of my contacts numbers are displayed as numbers only without names when they call or message me. I found out that the country code is added to their numbers (wasn't the case before the update). So, a number, let's say, 555-5555, must be updated in the contact list to read ([phone]. When I add the country code however, I still receive a call or message without the name, because it comes out without the country code, i.e. 555-5555! Confusing indeed.
2. All of my m4r files, mainly ringtones, have disappeared from my iPhone, though the sync process via iTunes shows they were properly transferred to iPhone. When I go to Sounds setting, or playlist, there is none. (Wasn't the case before the update. My ringtones were part of the Sounds setting)
3. I have double photo albumes for the same photos in my iPhone photo library. I only select one folder in my computer to sync with iPhone, so the photos in this folder are now copied to Camera Roll, and another folder called Mobile. (Wasn't the case before the update. Photos were placed in Camera Roll only)
Other than that, all working fine so far.

Answer 1

Note on point 1:
This is the issue with contact numbers as I further found out:
The problem basically with messages and calls.
Adding a country code to a contact number will show contact name in messages but not in calls coming therefrom.
Removing the country code from the contact number, will show only phone number in calls but not in messages where I only get the number without the name!
To overcome this problem, I have to register the same number for each contact twice, one with a country code and the other without! Duplicating numbers for each contact obviously is not the right solution.