I think you can pretty safely treat disarm, trip, etc as improvised actions. The real benefit of the battlemaster is that they get to do these things outside the action economy. When you make it take a whole action (without getting to attack along with it), it is much weaker and usually not...