A really big, terraform able water world may rarely be worth more than an Earth-like world, but generally speaking Earth-like worlds are worth the most.
barring the complication of the terraformable bonus multiplier which is (probably, as far as we know, I think) always 1 for the ELW and can be less for a WW.
Hmm, that sounds like something worth investigating...