Yes. Your assumption is correct.
- Jhanic and samapatti sukha are also”distorted saññā.”
- Brahmas (and Anariya yogis) get attached to them via the similar kāma guṇa (but at a lower level; Brahmas don’t engage in killing/stealing, etc. Of course, they don’t have the physical bodies to take such actions, but in any case, such strong greedy/hateful thoughts do not arise in a Brahma or an anariya yogi.)
- Getting rid of attachment to jhanic and samapatti sukha is what is left to do for an Anāgāmi.
