The thing about WISH is that it has a seriously high coolness factor. It would be a real pity to lose it, and I would prefer any other solution that works.
Maybe alter the wishes themselves? No more asking for specific creature types - maybe you could wish for a "saviour" or somesuch, and get a random creature from a pool of pretty-good critters.
Maybe also do something about chain-casting Armageddon. In general, have wishes that improve the position of the wisher, rather than trashing everyone else.
Or just make clams water-1, nature-1
