Yeah that's nice thing with electric for sure is being able to put a timer, I will probably setup a contactor controlled by a RPI that can have it turn on/off on a certain schedule. (unless I can find an actual timer that supports 240v 20 amps) hydro is also cheaper at night so I would probably turn it on between like 1am and 8am to ensure it has a chance to come up to temp, that would basically cover my shower when I have to get up early. If I get up late, I'm hoping there would be enough residual heat. I'm kinda aiming towards going with the larger tank as it will hold heat more. Either way I can tweek the timer to best fit my needs.
For actual heat, probably going to look at the wood stove more seriously now, it does not look like there is really going to be an end in sight with these hikes and they're getting us both ways, so even when I expand solar I'm better off using that for actual house loads and not heat.