I think happiness is divided as you say into the present self, and the remembering self.
The present self is "happy" when it is feeling no pain, no anxiety, is calm and peaceful, feels free and unencumbered but safe and secure, and is mildly but not overly stimulated. In other words, it is...