You've said it all, setting the foundation for the week on Saturdays is exactly what do too. It's very important.
Chaiii I have great esteem for programmers like you. Thank God for the great mind you have that permitted you to detect the problem and solve it.
Lots of courage.