Agreed there's a trend in that direction, but as you say not quite there yet. What I imagine is a unit with the goal of helping civilians as a first priority, but with the full capability to defend themselves and the people they're helping. Similar to the Special Forces but with the priorities reversed.