Yeah...I basically felt the same way watching the Water 7 OP back before I got into the manga. Looking back at it...there really were a lot of spoilers in it...but you don't really think much about it until it happens in the story.