TFSAs can be created to hold ETFs, Mutual Funds and other types of investments. I can contribute $6k for 2020, and the total I can hold in TFSA is $69,500. I can contribute more annually as long as my total is under $69.5k.
With a raise, I can accelerate my contributions and continue to enjoy tax-free gains on it. My personal average income tax rate might go up, but that's offset to an extent by whatever returns I'm making through my portfolio.