Buzbait,

Your plants sound fine to me except for a caution on the waterlillies. Some types can become a major blight, and very are difficult to control.