Personally, I am a huge fan of having both Traditional and Roth retirement accounts as a hedge on future tax rates. Also, it allows additional flexibility to minimize taxes. So, that said, I think it depends on what your mix currently is. Could you do something like 75% Traditional 401k + 25% Roth 401k + Roth IRA? Also keep in mind that employer contributions are ALWAYS into a "Traditional" 401k account.