Nazir 3: Beauty Is as It Does

A note on Rivan, the son-in-law of Rashi, who takes his place, as it were, in Nazir. || Wording the vow to become a nazir - with a plan to become "beautiful." Is that enough to count as a nazir's vow? Is that physical beauty or the beauty of mitzvot? Plus, the beauty if long curly locks. Also, a new mishnah: mentioning part of nezirut counts as a vow to be a full nazir. And the Gemara explaining the views represented in the mishnah (R. Shimon vs. Rabbanan). Plus, how can the vow of the nazir contradict the requirement for kiddush over wine on Shabbat?!