Using @me.com email when @icloud.com is also available
Solution 1:
Go to Mail, Preferences and click on the account tab. You should iCloud in the column on the left. Click on that and a panel appears with your email adress. See image below.
Now if you click on the blue arrow at the end of your email address you should be able to choose the one you want.