OK, you should always invest in 401k pre-tax. That's a given. That's your biggest mistake. Unless you think you're going to be making more money at a higher tax rate when you need to withdrawal your money.
But, in the end, it all boils down to this:
WHO THE HELL KNOWS!
We don't know if tax rates will increase or decrease in the future, plus you don't know what your income will be like at that point either.
So, based on that, I personally invest want to max out my 401k (pre-tax) and my Roth-IRA (post tax) to hedge my bets.