Retirement tax questions

clarification regarding my calculations: 

 

Do the gains on my IRA investments have to be treated separately when separating pre and post tax money or just using my current basis inherently accounts for the gains?