These numbers are a bit old. 6k roth, 19.5k 401k. Don't try to put after-tax dollars into a 401k. I'm sure there's some way to do it, but it's not smart.
Rather than total market, I'd probably aim for S&P if you want it simple, but I've never been a fan of total market funds.