I've used a kettle to heat my new water (adding hot to a lot of cold), but now I just use the mixer tap to get aprox the right temperature, and add the water a little at a time. I don't have a hot water tank, it's heated 'on demand' by one of those fancy boilers, so it comes straight from the mains supply.
Add the water slowly. If the heater in the tank comes on, wait until it goes off before adding a more. If the tank water is moving well enough, I guess a temperature drop just enough to turn on the heater won't hurt the fish. I'm no expert though.