Question to parents of level 3 kiddos

So, my 8 year old is completely nonspeaking level 3. He is obsessed with spinning things. He really likes to spin those squishy stretchy toys right in front of his eyes. He will do this for hours while loudly vocal stimming. I have noticed though that over time it seems like he is overstimulating himself. He will get louder and louder until he starts screaming and hitting things and crying. At those points I usually redirect him from that toy and give him something more calming, but then he usually gets angry I’m taking it. I don’t want to stop him from stimming, but it seems like he’s working himself up into a meltdown a lot of times. I have been trying to find other activities that he might enjoy, or things we can do together, but he always wants to go back to spinning those specific toys. I just want to know is it right to redirect him when he starts working himself up? And have any other parents had kids with similar interests that moved to other activities?