Funny, I thought switching to unlimited use was the right thing to do. I would just hold on to whatever TMs I had out of fear of using a TM and then never using the Pokémon again.

I'd say the unlimited use of TMs is rather excessive when compared to Gens I-IV's one-time use TMs, especially if it came from a Gym Leader or on the road. In my opinion, they should seek the middle ground: have every TM in the shops and just like with items, the more Gym Badges you earn, the more better TMs you can buy. This way, you're not too complacent with your TMs and it's still technically unlimited use.