Is Water 7 and Ennies Lobby the same arc?

[Future Warrior]

Honestly, it's a pretty good arc but I found myself wanted to get through it already with how self contained the story was.

 

[SSJ2]

I don't mind the exploration part of the arc, I just find the villains fall short in all regards.