I agree with your observations. The 'sway moment' is amplified by P-Delta considerations, whether the frame is sway or non-sway and whether the column is slender or not. Regarding your following statement:
I think the non-sway factor (catering for deformations between the member ends, i.e., P_smallDelta effects) would be computed in both non-sway and sway cases. No? In non-sway frames, only non-sway factor needs to be applied. However, since we're doing a P-Delta analysis, the sway factor is also inherently present. Similarly, in sway cases, both sway and non-sway factors need to be applied. So, in essence, ETabs is applying both sway and non-sway factors for all kinds of framing.
As you've pointed out in the post you shared, as per code the moment magnification should not be applied for short columns, i.e., they can be designed on first order moments. However, given the above discussion, it seems these amplifications are being applied regardless if the column is short or slender.
Now, I just noticed that the non-sway moment factor in "Concrete Frame Design Overwrites" is by default set as 1. We would need to set it to 0 for the program to compute this itself for each member for each load combination (screenshot attached). I suppose if we're confident that our columns are non-slender, then we can avoid the non-sway factor by keeping this as 1. The sway factor would still be applied via P-Delta.