Wave 4 can overlap wave 1 on ending diagonals. And also, wave theory was developed in the 30's, where there was no 4H chart, so wave 4 cannot overlap wave 1 on the daily chart. we'll see in the next few weeks
The most important thing is to understand wave theory, not to follow it completly. It was never finished, Elliott died before that. So you need to adapt it as with your understanding of mass psychology, and that hasn't changed.