You could also just turn off the breaker, cap off the wires, and put a cover on the junction box. Personally, I wouldn't change the breaker and add the outlet unless I knew it was going to be used for something. The new tenant could want to install another HPWC and just have to undo what you've done. They might not even realize that the circuit could support a bigger breaker if you change it.
Very good point.