It will be sad when/if he dies but also it will be sad if he lives... Sad for the state of the manga that is. People wont like either option but the best way is to stick to the words you have previously written he shouldnt contradict himself. No amount of backpedalling/explaining will change what kishi wrote. And i think its for the best, any op attack should come with a downside and death is this ones.
With that being said, i always wondered what if gai had the healing powers of hashi/tsunade or was reanimated by a powerful shinobi. That could be at least infinite of the seventh gate, whoever gets to resurrect gai will be a powerful player. Maybe this is what orochimaru is trying to do... Haha