I'm not sure which of these two I like better, but they're both quite similar. I have a thing for constriction, statue form, and Chei:
Naga version:
http://crawl.develz.org/morgues/0.10/Ta ... 062739.txt (from .10, when nagas started with constriction on turn 1)
Octopode version:
http://dobrazupa.org/morgue/tasonir/mor ... 105635.txt (.15 when it was trunk, pre-beta)
Technically statue form is considerably better on octopodes due to them not having any armor, and isn't as great for nagas, but hey. The +20% hp on nagas and easy shield use is nice, as well as rPois/Sinv. It is definitely much harder to get started on a naga, although getting octopodes started with 1 ac is a wholly different issue.