A refined determination of the eta-eta' mixing angle and eta -> 2 gamma decay