The drinks of Naso

Interesting parallelism between 5:26 (v'achar yashkeh es ha-isha es hamayim) and 6:20 (v'achar yishtei ha-nazir yayin). After all of the sotah's preparations, her test is when she's given the water to drink. So, too, perhaps the true test of the nazir is when he drinks a cup of wine after his n'zirus ends.