Stock up on legacy movesets or wait for future?

My best 5 Golem are:
98% MS SE
96% MS SE
96% RT E
91% RT E
89% RT SE

I was holding off from evolving my 100% Geodude for future movesets, since I seemed to have decent movesets with good IVs already. But recently read that RT SE is the best moveset and mine's only 89% strong.

Now that I can use TMs, how should I think about this?
A. Use TM to convert my 98% MS SE to RT SE
B. Evolve 100% Geodude to see if I land RT SE directly (can fix later anyway if needed)

Another advantage I see for 'B' is that I can stock up on current movesets in case they become legacy soon (and future ones are worse).

Have a similar situation with Dragonite too - already have 100% DT H and 96% DT O, and holding on to a 100% Dratini.

Suggestions please?
[Note: Candy/dust not a problem]

Edit: Thanks for your responses. Evolved and got an RT/SE ? Now wondering if I should try to TM one of my 96/98 Golems to get Rock Blast. I don't have any RB so may be good for variety?