I agree, container queries feel like a natural fit. I saw that they're supported in every major browser now, but haven't personally tried em yet.