As much as I love the dwarf stuff, I think bumping it out of this season might be exactly what is needed to make a cohesive movie version. Focus the first installment on Galadriel and the Harfoots, and after Galadriel discovers the map in the sigil, tie in the Southlands.
In the end, maybe introduce the sickness of the tree and Elrond’s assignment to help Celebrimbor. The hope being that it could be the first major thread of the season 2 (or 2a) movie.