i think NATO needs a two stage mechanism, the first of which remains collective defence, the second is a security guarantee for infrastructure/geography/shipping-lanes/etc considered vital by NATO and concluded with the nation playing host to that vital thing.

NATO itself is fine, but it needs to be more in this globalised world.