My photos won't load in my camera roll, any fixes?

With the last update (ios 7.0.4, I think) I had to do a complete restore of my iphone 4s, which is nearly always painful for me, but I got everything restored correctly, except my photos. I can see spaces for the pics in my camera roll, but when I open them I get an infinite "loading" screen. On the albums screen, I see the camera roll and my photo stream, with a downloading... visual below. Has anyone experienced this, and more importantly, does anyone have a fix? I also have a screen pop up sometimes saying that I need to connect to wifi to continue restoring my phone, but being an iphone 4s user I've given up on ever having wifi again...is there a way around this? I restored my phone through itunes, and everything but the pictures are fine.....