If the martial Adept feat makes it into the main game, switch your fighter from Battlemaster to Champion. You get the improved crit and can use the feat to pick Riposte and a second maneuver.