Yeah.
Fight Ifrit with a lamp = 100% drop and after that 24h cooldown but you are always able to enter the battle without a lamp and you don't get a drop.

Something like that...

Sounds 100 times better for me than what we have now for me.