I don't think Enterprise D was a misallocation of resources anymore than a modern supercarrier is. Both basically have "all their eggs in one basket" and both are just as vulnerable if their outer layer of defences is destroyed or bypassed (the surrounding battle group and aircraft in carrier's case).
As Kirk had the Constitution class refit in the films, so should Picard have always had the Galaxy class, maybe a refit in all his films.