Hi, I owned the classic. I got so made at the battery failures and crashes that i threw it away.
I bought the nano and it works better than the classic in every way. Whether you wait for the next one or not, the nano is a much better device. One advantage, especially if you use it while working out or being active, is no hard drive. The absence of a hard drive means better battery life and no skips of a read/write head. In short, I'm pleased with the nano.
I'm buying the iPhone shortly. I hope I'm as pleased with it as the nano. Good luck, Jeff