It wouldn't be a matter of the number of disks in a shelf, but the raid group size and number of disks in the aggregate. Even if it would work, you would end up with wasted disk space as the largest aggregate you can have is 16TB. With 320GB disks, that would be roughly 56 disks, with 1TB disks, it would only be 16. So, if you have more than 16 disks in your current aggrate, you would exceed your max aggregate capacity after 16 1TB disks if the filer were to see them as 1TB disks.
The option you suggested of a single RAID set per aggregate is not supported as this would require 19 disks in the RAID set.