Retirement tax questions

If you have the correct basis then tell the current administrator so they can update their records so the 1099-R is issued correctly.   If they will not or do not issue a correct 1099-R then you can make the adjustment on the return.