Bismillahir Rahmaanir Raheem
Al Jawaab Billahit-Tawfeeq
The translation of the verse 21:30 by Saheeh International is as follows:
"Have those who disbelieved not considered that the heavens and the earth were a joined entity, and then We separated them and made from water every living thing? Then will they not believe?"
In this verse, the phrase كل شيئ ØÙŠ (every living thing) is general and it apparently seems that it means all living things. However, scholars say the meaning of this phrase is specific, and certain creations are excluded from the meaning, such as Jinns and Angels.
Shaykh Fakhr ud-Din ar-Razi explains why this phrase excludes certain creations in his Tafseer Mafatih al-Ghayb. He explains that, the evidence of this phrase meaning specific living things only is the fact that this verse is a rethoric and its purpose is to make disbelievers ponder over certain aspects of Allah's creations. So, in order to ponder and reflect without difficulty, it is necessary that the subject matter which is being pondered over and reflected upon can be percieved by human senses . This is why the phrase excludes Jinns and Angels because disbelievers generally cannot see and feel them (and hence they are unable to ponder over it).
Thus there is no contradiction between this verse and the fact that Jinns and Angels are not created from water.