Yes you can upgrade to the 30gb as well as the 40gb they are the same size(thickness not memory) and work with the hard drive cable and OS.
open