What you did by changing the Supply and Demand zones is to follow the base learning of looking for the moment when price pushed away from a position and even when in a consolidation as this is the point the Supply Zone started at.
Mark up every level on the 1 hour to get the best points for S&D zones if they break these zones go to the next levels on the 1 hour or 4 hour.
Only ever have 1 set of S&D in place as to not complicate the charts.