But its 9 hours overnight + ? hours of nap for total sleep. My own 3 yo isn't ready for sleep until closer to 8 pm if he has any kind of a nap.
I don't think the crib is a problem, but I do think that since he is in a crib and can't help himself to things he needs, you should provide a water bottle he can reach. Also, if Dh doesn't mind responding to him, then it can be Dh's job. At that age, I have kids who take a small drink several times before bed, but don't need me for it because they have open access. I also wouldn't bother to make any major changes if you are moving soon.
Ds1 (2006). Ds2 (2010). Ds3 (2012).