Water Heater Automation

I have a water heater connected to a recirculation pump. The setup had a manual switch so you can turn off the water heater e.g. when going on vacation. I wired a Aeon Labs Aeotec Z-Wave Micro Smart Energy Switch, 2nd Edition ( https://www.amazon.com/dp/B008VWAPU4/ref=cm_sw_r_udp_awd_FwGFtb1AE6MQPZMX ) Into the circuit. The manual switch is now also connected to the aeon swith. I used the smartthings dashboard to turn off the water heater during the day if nobody is home (=AWAY mode) and to turn on at 6pm before anyone gets home (if in AWAY mode). Right now I using IFTTT to also turn the heater off in the evening after going to bed and turn it on in the morning before I wake up with sufficient time for the water to get hot by the time I want to take my shower. I will have to wait a month or two to report back estimated savings from the gas bill.

Has anyone created a “scheduling” app with multiple on/off points dependent on modes? I can only find apps with one off and one on event.