After working for more than a week on this one feature of water logic, I finally cracked it. Water overflows above recognized structures. The animated gif showcases a couple of features in action:

• filling up structures
• random droplet upward-fill rather than algorithmic seeking
• once a structure is filled, it will now fill one row above that structure

bug:

• water should flow out to the sides once overflowing the structure.