I believe they'll all come eventually, the upgrade nets will make it easier to catch some (those dragonflies are REALLY fast) but no you don't *need* to upgrade. And they should come around eventually.

As for the water...dunno. I might test that out when I start over.