Maz, yes what you did is fine!
Bob, I drain via the gravel cleaning cylinder section being attached to a long clear python hose going 50 feet down the hall to a catch-bucket placed in a bathtub (or in the garden in the summer sometimes or when weather is nice.) I just give the far end a suck to get it started and the siphon drop (typical tank cabinet height) is enough to get some nice gravel cleaning accomplished.
jmkgreen, there are faucets you can get that separate the temperature control from the on/off/force control. I have one of these on the bathroom faucet where I do the draining mentioned in the previous paragraph. This allows me to take a cup of tank water from the tank-draining-catch-bucket, place it on the sink and hand match its temperature to to the faucet temp I'm adjusting. Then I can attach the same drain hose to this faucet, turn it on and know I'm getting the temperature I already adjusted. These types of fixtures are fairly commonly available for sinks and tubs if you reach a point in your household life where you can justify it.
~~waterdrop~~