Suggest putting the 'emerge --metadata' line with etc-update suggestion. After the old version of portage has been removed. Went by very quickly the first time and missed it.
*** This bug has been marked as a duplicate of 11359 ***