Resolved Question: What would be the better choice-buying a 120gb iPod Classic now or just waiting for a better MP3 player later?

I want to be able to take all of my music with me, which comes out to about 30gb worth at the moment, but I want to have plenty of empty space for future music that I will want to put on it later. The 32gb iPod Touch is currently too expensive for me, great as it is.

I just want a music player. I'm not interested in any other features like games, web-browsing, looking at pictures or videos, or anything else. I simply want to listen to music with it, that's all.