8gb iPod Touch?

I ordered a refurb 8gb iPod Touch from apple store

I have 842 songs 39 pictures.

I used 3.55gb Free space is 3.89gb

Is 3.89gb enough for movies, videos and applications and a bit more pictures?
Or should I purchase the 16gb iPod Touch on September when they reduce price and maybe change the iPod Touch.

I dont have to worry to much about music space since im not adding much music now since I have all my fav artists already and may get a few new songs from here and there. Im just worried if I would be able to have enought space for videos and movies/pictures. I know application isnt a problem since it dosent hold up hardly much space. Im also looking to jailbreak it. But I already learn how to do that, just waiting for my 8gb ipod touch to be sent to me by mail.