I've also found that just directly making myself happy, by following urges and wishes, is a local maxima. I get a lot higher peaks of happiness by helping others. Thus a great factor in improving my overall happiness has been spending a bunch of that freed up time on altruistic work. Usually unpaid, just wanting to help others with those same skills that allow me to spend so little time working on my career.