If you eliminated the whine, without divorce, with just the fluid change, then you did the right thing. Most of society is mechanically deaf until they need a tow.
Silly countdown timers, OE mileage interval recommendations, belly-rubbing enviro-eco friendliness, ... will lead to exercising that 10yr/120k warranty. What if you keep it longer than 120k???
Maintain it more often, and don't be afraid of aftermarket cvtf.