Hi Blackbeard! I think you've done a great job tailoring the flush to suit yourself.
I would recommend drinking only water after 3:30. No juice.
I also like to mix up the ES at the time I'm going to take it. For me the room temperature water is best too...easier to swallow. (but, of course, that's a matter of taste!)
Note: after your last morning ES drink....you may start to drink water and you can even have juice within 15 minutes or so to start building up again. This makes recovery easier. A lot of people see no need to wait another 2 hours.
Sounds like you've got a great program! Can't wait to hear how it goes and what you get out!