SarathW wrote:Could someone help me to clarify this please?
I don't know that I can clarify per se, other than to say that you're not the first to observe that the Abhidhammic interpretation of these terms has evolved beyond their original Sutta usage.
Modern meditation guidance that is rooted in the Visuddhimagga is similarly founded on the more technical and prescriptive Abhidhammic interpretation.
How you proceed will probably depend on what set of resources you find most authorative or useful.
"Do not force others, including children, by any means whatsoever, to adopt your views, whether by authority, threat, money, propaganda, or even education." - Ven. Thich Nhat Hanh
"The uprooting of identity is seen by the noble ones as pleasurable; but this contradicts what the whole world sees." (Snp 3.12)
“One to whom it might occur, ‘I’m a woman’ or ‘I’m a man’. Or ‘I’m anything at all’— Is fit for Mara to address.” (SN 5.2)