End of an era?

My iPod battery appears to be dying. At some point, I've come to the realization that it will have to be replaced. I dig the nano, but would rather hold out until the GB increases.