@ Prime X : I also archive Naruto episodes. I was very patient when these fillers started . I thought maybe there would be only one or two but they started mutiplying and then the announcement was made to carry on with them. Thats where I stopped and deleted all episodes till episode 135. /i think you should do the same. (IMO)
DB is not a bad choice for your collection. If you want to carry on then DB is the best choice until AonE finally start subbing agian.