I think I have this right but I'm asking to be 100% certain.
Our company has done away with the pension plan and they now match up to 6%. So, of course I'm maxed there but I also signed up for an automatic increase of 1% every year.
The question is: Put that 1% in a traditional 401K or Roth?
I put it in the Roth. Right?
You want to put the first 6% in whatever provides a match - typically the conventional 401k.
After that, if available to you based on your income, the next choice is the Roth, up to the max of $5,000/yr ($6,000 if > 50 iirc).
The reason you move to the Roth next is to hedge against tax variations as you get older. The Roth has a fairly low cap on how much you can invest now and NEVER pay taxes on later (since it's post tax money) so you would only NOT pick the Roth first if you have something that guarantees an even better return - and a match on the 401k does just that.
Once you cap the Roth, go back to the 401k up to its max of $16,500 (iirc) or until you hit your target %. If you hit the cap and still want to invest more, you'll need to explore more conventional, non tax favored options.
But as I recall you still have a HELOC - and maybe some other debts that aren't mortgage debt? If that HELOC is < 50% of your gross income, I would not put more than the match away for now - get that debt eliminated first before you go beyond the 6% matching amount.