The method of our warfare I would argue is diminished in comparison to say Vietnam going back. A good example for that argument is to end WWII with Japan, and to avoid a costly land invasion, we opted to drop atomic bombs on civilians. Enemies yes, but civilian cities with unknown total impact. Something we would not entertain as an option today unless we were talking in nuclear war terms.
We may still kill innocents much to much, we may still engage in plenty of action that is questionable by UN resolutions or international agreements, and we may do plenty to our own citizens in questionable Constitutional terms... but I would still not go so far as to call the US a terrorist nation.