"I should change the box that asks the total life contribtion to include this $24k along with Roth IRA contribtutions?"
Yes.
