Sounds like you've got it all figured out. Be careful choosing the heated water. I bought one that didn't have a top fill. It was plastic and filled from the bottom and when it was full and you put the bottom on, I had to turn it over. It was 5 gal and so heavy to turn over I had water everywhere. LOL