This is easily solvable by making a house rule that PCs may not start play with a stat greater than 16. Help players put their points elsewhere to create more rounded characters.
Let me add two features I particularly like:
Action Surge. Useful for so much more than an extra set of attacks...