Good post, however, there is a difference between grieving the Holy Spirit and Quenching the Holy Spirit.
In the former, one is merely acting independently of God and His Plan, choosing not to use what He has provided.
In the latter, one is not merely working independently of God and His Plan, but attacking Him and His Plan.
We were all condemned prior to salvation, but our natural state from the Garden is enmity towards the Adversary, not complacency.
Witchcraft reveals a further degenerate thinking than simply agnosticism, atheism, or many other false gods.
In both scenarios that you give, the people are in rebellion against God. Rebellion is as the sin of witchcraft. God makes not distinction and there are no ‘degrees’ of sin.