So sorry for your loss, sounds like you loved each other alot. I was using those steel ball waters for a bit too, using two incase one fails but got too paranoid that it was gonna fail I ended up just getting an open bird style water bottle. It's been pretty good, the gliders get the water pretty dirty with food quickly but all the more of an excuse to change it out commonly.
I didn't mean to take away from your truely heartfelt story, just agree people should be more sceptical of those bottles. I hope with time you give them another shot and treat them with as much love as Ciri and Yennifer. <3
I think I got most of it covered for you now lol. Water bottle or solo water JW Pet Company Clean Water Silo Waterer Bird Accessory (Colors Vary) https://www.amazon.com/dp/B0002DJW1I/ref=cm_sw_r_cp_api_glt_fabc_21FY1Y3K7HK3SXQP188N is good or one for hamster is good . And both those bird cages I link you too come with the food dishes. So covered. You just have to pick toys you like and think safe.