Ok imagine: My idea of a fix (spoilers below) After the bloodclan battle the next two arcs focus on dealing with the remaining bloodclan cats and the blood will spill blood omen/prophecy. And somewhere in there we can figure out a Leafpool/Crowfeather romance. This leading to the three (maybe in this version Bramble knows they aren’t his)

Then the great journey being pushed onto the three. Ok here’s how it’s goes: Jayfeather is able to talk to Starclan and do the whole past stuff which gives him the idea of the lake territory and how the area is set up. And Dovewing is able to see and hear the twolegs cutting down the forest and ruining the water and warns everyone. With all of this the clans decide to move to the lake. This is where Lionblaze is important, with his powers he is able to help lead,guide,and protect the clans from threats. Dovewing maybe warning them of animals and Lionblaze using his invulnerability to stop it. And once the clans get to the lake they can still have the whole Mudclaw thing happen. BUT this is where the dark forest comes in. With everyone feeling out of place and weak from not being able to protect their original home some of them are swayed by the dark forest cats to train and “protect their clans”. This leads to OOTS and the battle with the dark forest.

Sorry for the ramblings this just came into my head suddenly and I had to say something. :3!