Iran's latest proposal sets aside nuclear discussion until war is ended, disputes over shipping from Gulf resolved