I have solved: Oh No, Not Again.
My solution is very tight. I had the main idea relatively early but couldn't implement it until now. Could be a backroute though.
Edit Simon: I attached my solution too, this arose after massive counselling by Forestidia and is probably similar to hers.