TOMY or Trackmaster voltage upgrade mod (high speed)

hi, cool.

Ive been debating to either get a new motor for some of my trains or convert the C battery and the one AA trains to 3V. Wondering if you had advice on doing one or the other (or both).

thanks