I would say Starfleet should be less militaristic in peace time and more militaristic in war time. Just like Sisko is a war time captain and Picard and Janeway are peace time ones.
Battlestar Galactica is case in point. Prior to the human genocide, the military was more like TNG's military. Their war ships had gift shops, everybody used networked computers even knowing that if the cylons attacked they could destroy their ships instantly that way. And any pre-war flashback in the show seems remarkably similar to Star Trek society except more cynical.
So, perhaps Starfleet should be like a less naive, more careful version of TNG in peace time and like Galactica in war time.