well I think you're kind of right; I'm only doing reading next week (I did my listening in Janurary) but all I do is learn vocab and do past papers, if you're doing aqa the go to there website as they have some past papers on there. One way I learn vocab is to translate webpages I'm on into spanish and try to pick out words I understand, then I translate them back into english to see what I got right.
I don't know about websites, but for Spanish listening, definitely see if you can find any DVDs lying around which go into Spanish and just watch them with English subtitles. I did it for my French listening this week, and I think it helped me get a feel for the language. Also, it doesn't feel much like revision!
What I do is do loads of past papers, and then find the vocab or topic that I am not so good on. Then, I will make matching cards or minds maps (with lots of bright colours) to revise the vocab. If you are not a visual learner like me, then maybe you could record you or a friend speaking the language, and then put the sound file on an iPod or MP3 to learn it