No brainer, TTar. Given the current raid boss landscape, you might consider using a Fast TM on the Golem (assuming you have some RT/SE you're happy with).
In general, I prefer planning for Fast TM changes over Charge because:
1 - You know what you're going to get for sure, unless you're dumping a legacy move.
2 - Fast TMs are more common.