I can't say which approach is most in line with the original meaning of eudaimonia.
Passing comment not meant to claim correctness: I think I remember from college philosophy that Socrates actually spoke about hearing or feeling the prompting of his personal "daemon" - perhaps I am wrong. But I wonder if it is getting far afield from the way the word was originally used to exclude connotations of "blessedness" from a "divinity" point of view. Or the opposite - was the whole meaning of the word just an "idiom" for them, with no specific clear meaning, just many of these words are for us?
I have no real clue, but then again I probably couldn't easily pin down what it means to be "happy" today either, without going off on all sorts of excursions into various perspectives and definitions.