I think the designation of A1 as kinetic and A2 as katastematic would not be helpful. Regardless of different readings of the texts, as I understand the situation the k/k terminology is not nearly as well establishable in the core Epicurus and Lucretius texts as is the discussion of the difference between "stimulation" vs "absence of pain / normal experience of life."
Actually, from my reading of the texts, that is exactly the description of kinetic and katastematic. There seems to be no strict, formal "mental" or "physical" pleasure categorization because all pleasure at heart is "physical" and material. Epicurus identified kinetic and katastematic pleasure to define his broad spectrum of pleasure available to us, rather than the narrow band accepted by the Cyrenaics or later but Cicero.
Pain on the hand can be (broadly) defined adequately as of the mind or of the body.
I also think we need to acknowledge that there is a difference between pain and suffering. Acknowledging and dealing with pain is one thing. Dwelling on, focusing on, wallowing in pain increases suffering, not the pain itself. This, if I remember correctly, is corroborated by psychological research, including the work of Jon Kabat-Zinn. Suffering can be self-inflicted. It doesn't make it any less real, but I think this idea of suffering vs pain is directly related to Epicurus's situation in his dying days.