The U.S. has also seen major mission creep in the military. Instead of going in and bringing a devastating kinetic assault to an enemy in order to get them to surrender, now we're in the mission of Counter-Insurgency (COIN), nation-building, handing out candy to kids, and air-lifting supplies in to earthquake victims.
Because of all of that, I think we need a new branch of the armed forces specifically set aside for nation-building, humanitarian relief, and so forth. It's a completely different mission from the other branches, and deserves its own budget, training, and voice. Then, civilian police forces should only pull military members from that branch.
We need to separate the warrior mentality from the protect and serve, community-friendly mentality. Some organizational re-alignment may help.