Bernheim and Rangel have a paper out in the current edition of the AER on choice-theoretic foundations for behavioural welfare economics. According to these authors, standard welfare analysis is based on choice, not on utility or preferences. And they have devised a new approach to welfare analysis where individuals make inconsistent choices.
See a version of the paper here.
