Words like "entrapment" do not change definitions,
Words like "entrapment" change meanings all the time. The specific word "entrapment" already has, by your own admission, at least three meanings, one of which includes the example of someone being entrapped by their emotions. If you think the law should simply use "the dictionary", then you really must think that the law should prohibit people being entrapped by their emotions just as it prohibits the government entrapping them in criminal activity.
Entrapment is a very simple term without much room for negotiating intricate meanings.
In the law, entrapment should be a simple term without room for negotiating intricate meanings, and it can only achieve that by leaving the Webster's or OED behind and defining it in simple terms to mean exactly what is intended.
The court ruling dictated that a certain segment of society (The "State") does not have to abide by the same rules as everyone else in society.
That's nonsense. "Everyone else" cannot be guilty of entrapment because entrapment can only apply to a government agent because that is how it is defined by law. If I convince you to go rob a bank, you can't point at me and say I'm guilty of entrapment, you can only claim I'm a co-conspirator and should go to jail too. Were I to "entrap" you to rob that bank by appealing to your emotions, I may have "entrapped" you according to one dictionary definition, but you aren't going to avoid jail by arguing that there was "entrapment".
Were I a government agent doing that, neither of us would go to jail. Since entrapment is still an affirmative defense, why you think the government can do it without repercussions is a mystery. Entrapment is a concept that applies ONLY to the government, and is prohibited to them, so how you can say that they can do it while others cannot is, well, I don't really care why you think such an obviously silly thing.