Oh, yeah, Gene's Vision 2.0 definitely precedes TNG by years, but that's where it really became noticeable. It was developing during all those university lecture tours. Distinguishing himself from the Bennett/Meyer Trek was a big part of it, but the other factor was Roddenberry believing all the press he'd been getting about being a progressive visionary. His book Report From Earth was going to be a deep and meaningful look at how wonky human society would seem to an alien civilization, but the bits he trotted out during the lecture tour I saw him on were about as deep as a comedian saying, "What is it with airplane food anyway?" So the anti-military thing (and the utopian thing and the perfect humans thing) was, I think, as much about "hey, I'm a visionary and a deep thinker" as it was about "Wrath of Khan isn't my Star Trek." It's funny that the whole "we don't have money in the future" thing came from one of the GRless movies, though.