Still, even if he died, he could've at least got his 'perfect world' he wanted. I would've preferred him to prepare a bomb just in-case, to blow the warehouse up so his secret was safe. There were many alternatives and actions Light could have taken, and he did not manage to think of one of them!