> I'm not sure, after a certain threshold, more money = more happiness.

Well definitely, as can be seen because the richest man in the world does not appear to be the happiest man in the world. Within reason, I'd say more freedom = more happiness, and money is a tool for getting more freedom.