Yes - trying to shove all of the non-magical martial mechanics into essentially two classes is a mistake in design for this edition IMO.casters run the gambit... you want simple go warlock, somewhere between go sorcerer complex wizard or cleric... warriors not so much
You can see it in the Tasha's Fighter writeup where they try to create a whole bunch of "builds" for the Battlemaster to cover all kinds of different fighters. No other class does things like that - the other classes use subclasses instead of builds. So the Battlemaster essentially gets its own set of subclasses because it's actually not defined enough to be a subclass - it's more like a class that is crying out for some subclasses.