I'll dispute the idea that he went into the world to fight popular struggles of other peoples. Precisely his defeat in Bolivia, witch lead to his ilegal execution, was in good measure because he failed to rally support from the Bolivian rural lower classes. His forces were found because he was denounced by some poor Bolivian peasant. However I will agree that the perception of his military actions were/(somewhat) are what you describe, which is what matters in the end.
But, back on topic, keeping him in a powerful position in Cuba could easly let him out of the T-Shirts. Providing also that the USA's government takes a less confrontational, more insidius and cunning approach to the Cuban Revolution. What I mean is no embargo (which for instance involved no more Hollywood movies exported to Cuba), no Pigs Bay, et all. Instead, fill them with music and films about the American Dream/Way of Life, support dissidents inside the islands and so on. Instead of playing it with the so-called "hard" power, use "soft" power instead. While it might or might not work to undermine the regime, it's not going to give the Revolution the opportunity to be seen that Anti-American/(so-called) Anti-Imperialist since the USA isn't openly opposing it. Hence, the Che's image isn't imbued in that Antiimperialistic, independentist (arguable, I don't agree that it's real, but it's perceived that way) idea. I'm not saying it's going to make the Cuban Revolution fall, I'm just saying that it will undermine the Che's image, which is what we are talking about.
As for "taking the rock music away" I don't see how/why. It was the establishment that the Che fought the "side" that opposed Rock & Roll. What would he gain? Playing it smart, it isn't as some Iranian fanatic muslims nowadays want to portrait: "the evol American cultural imperialism", playing it smart is using a music that young people adore to spread one's cause