I maxed 401k & TSP every year since I started, convinced DW to max 401k after a few years to transition to that mindset, and I also maxed my Roth IRA each year. Now we're in that phase out limit, but the last few years I switched mine to mostly a Roth TSP, but that puts us in the phase out limit, so we can only contribute maybe 30% each to our Roth IRA at tax time each year. For us the decision was to have multiple buckets, but mostly b/c if I work another 17 years until pension (which I'm planning to do), we'll have so much in traditional that it could be a tax problem. So with multiple buckets, at retirement time, we'll get my pension, then can tap traditional and use that for expenses as well as conversions to Roth IRA (after we move from TSP to rollover's) and can let the Roth grow tax free while we live off of pension at traditional. In the end it may balance out most likely b/c I can't fully fund Roth IRA anymore now that AGI is higher, but I do like having more money in Roth accounts as it gives a bit of flexibility.
For you though, if you will end up projected at $1.2M Traditional, I would just keep it at that, as once you retire you'll have your pension, but still a big gap from what you normally make pre-retirement, so you can use your traditional and be at a lower tax bracket still (at least up until SS kicks in).