I forked OP's study and graphed out how Happiness vs GINI looks when you scale the markers by GDP per capita, there is a clear trend of increasing happiness with increasing GINI, but it snaps back for the highest GDP per capita countries

(disclaimer - I founded Kyso - the company these studies are hosted on)