i reread 6 and 7 after seeing the book. i think there might be a reason they dropped the battle - because the ULTIMATE battle at the end of 7 happens at Hogwarts. They may have been willing to let it go in 6 so that when it happens in 7 it's epic and not repetitive.