2024:
Thompson, Taupau, Bullemor, Frizell, Sorensen, Baker, Price are the ones I'd consider without breaking the bank, so we don't really need to do anything until the 25 crop as you said, so we still have time but even so, Haas isn't re-signing before he goes to open market, his manager won't let him even if he wants to.
2025:
Haas, Riki, Ese'ese, Mo, Stimson, Paseka, T.Eisenhuth, Curran, Arrow, Koloamatangi, Tatola, Su'A, Twal - these are the ones I would be interested in, though some obviously WAY more than others. If we did lose Haas, I'd love to go after Tatola/Mo and Arrow / Paseka to replace him.