My memorie is foggy on the details at the moment, but I think it could be cut after the visit to see Luna's dad. Emotionally, it would hit the right notes, and I think it would be a good stopping place. I just checked, and it's after Ron comes back, but before Malfoy Manor.