Enhanced photon traps for Hyper-Kamiokande