Bring it on. But ditch Riker, a captain-in-training really has no place in a two-hour, big-budget tentpole film.
The man of action part of him work okay in juxtaposition to Picard, but you're right about the captain in training.
Riker wasn't the captain in training, he was the ship's executive officer, its second-in-command. Spock served in the exact same capacity except he also doubled as chief sciences officer.
If anything, TMP & TNG "got it right" by having the XO be a full-time job onto itself, rather than a part-time one shown in TOS.