>>38159042Use a mix of the setups. You need to beat a gym or trial or whatever to gain access to it, but once you have it you can use any Pokemon in your party or PC boxes to use the move.
For example, you'd beat the water gym and gain 'surf', and then if you had a water type in your party you could approach a lake and then ride your own pokemon around it. If you didn't have a water type in your party, it would instead call one from your box, similar to the current pokerides.
Since every mon has walking and running models that can be used in the overworked, and they made it work for LGPE, they could probably be pretty broad about what creatures you can use. They don't even need to all be rides. You could plow through a series of rock-smash boulders on Taurus or Onix, or you can press a button to have your Machop following you do a little attack animation to break them one at a time.