b) I bet that we'll have wars even if everyone has all they need. I'd like to be wrong.
This. Not because scarcity isn't present, but because it is fundamental and inevitable; distribution isn't he thing that can be addressed, and scarcity is not.
b) I bet that rich countries, where people have all they need, will not provoke wars or engage on unprovoked wars (unless for humanitarian reasons).
a) scarcity of resource (oil) / humanitarian reasons (whichever you prefer to believe)
b) was provoked into it (because of cold war or terrorists)
Yes, they do. They may not have what you view as critical shortages, but if thode things weren't scarce, in economic terms, they would be free of cost.
> Things do become more abundant
Yes, but they continue to be scarce.