Anyone concerned about going to all the effort for only 10GB why don't you go form 30GB to 60GB with the Toshiba MK6034GAX

20GB may be just about the practical limit for the music partition. If we are limited to 400 albums, then you will never be able to fill 40GB of music.

I am at about 330 albums so I'll post what happens if I ever get to 400.

I got to 400 artists and it did indeed max out. This was with the Z1, I am not sure if anything has changed with the Z2.