I think some people are going to make a hybrid version of V5 and V6, because a lot of people agree with you on those 2 points, and in that the droid factory sequence should be kept out of the movie. So maybe look out for that! 😉
I might make my own edit to accomplish those changes and a few others. As for the droid factory scene, it was a post-production replacement of an unreleased deleted scene in which Jango Fett captures Anakin and Padmé. Although it is imperfect, the capture of Anakin and Padmé is necessary to the plot. Otherwise, they willingly walk to their doom.