A potentially interesting additional axis would be income inequality. One very wealthy person among the poor can skew the average GDP considerably, but happiness is relative to a fixed maximum and doesn't distribute the same way over the population. Qatar might be an example of this.