Pay back HBP early?

Hi!
I don’t have a lot of RRSP contribution room this year, and my salary just increased quite significantly in the last few weeks. I know that my 2025 salary will be much higher that this year’s, so I’ll probably wait until 2025 to add new contributions in my RRSP. Plus, I maxed out my FHSA (8k$) earlier in the year before we bought our house. This 8k$ will already reduce my income for 2024, so that reinforces my thesis about waiting for next year to add new contributions to my RRSP.

I wonder, however, if I’d do better paying back a bit of my HBP this year or put the money in my TFSA.

My reasoning is that starting to pay back my HBP this year (despite a 5-year grace period the government recently announced) will actually reduce my yearly HBP payments when they’re due, thus making it easier to try and max out my RRSP and TFSA.

Another thing to consider is that the earlier I invest in my TFSA, the more tax-free growth I get over time, whereas HBP repayments will be taxed upon withdrawal later on. I guess that might be my answer right there.

Just wanted to share the idea and was curious to read you on this.
Thanks!