IPod Clic (7g 106gb) or iPod Nano 6g (16gb)?

Ok so I already have an iPod touch 4g, it was given to me as a gift so its only 8gb. I definitely need more than 8gb. I think my whole library might be just under 16gb and will definitely grow. Im stuck between which of these to get. What draws me to the nano is that its really small so i can take it anywhere all the time which is a really big pull for me. Plus its awesome for working out. However Ive never had an iPod more than 8gb and i really really feel i need to be able to take my whole collection without having to select which songs to put.... What are your experiences and what would you suggest? Amazing portability vs immense capacity.