If I were you, I would continue with maxing out the after-tax contributions. If you have sufficient taxable investments to last until age 65, what would be the point of directing these funds to taxable accounts instead of after-tax 401k? And even if you didn't have sufficient taxable investments, you would still be able to access all of these contributions immediately upon retirement (after they've been rolled into the Roth IRA). So the only downside for you is the headache of keeping track of all this, but for that effort you will gain the benefit of sheltering at least $13.5k per year from taxes forever (and probably more, because you can get the earnings on those $13.5k after the 2-year waiting period into the Roth, and I think you can also eventually get the pre-2-year waiting period earnings into your Roth conversion pipeline too -- see my latest post in the main thread on this topic).