I will definitely check with the vet on the whole thirst/diabetes thing. However, we had a much better night last night and morning. We took a walk in the evening, gave him some water when we got home, took him out twice before we got into bed and he actually settled down and fell asleep in our bed (where usually he's wide awake, messing around with his toys and jumping off the bed to roam around).
A few days ago, I found this really cute Coleman sleeping bag for dogs - it's just like a regular sleeping bag, but much much smaller for our little guy. We had been camping over Labor Day, but had to leave him inside the trailer at night because it was too cold for him out in the tent. So I bought it, figuring he could snuggle down into it and be completely covered up and we could use it for camping or during the winter months (we live in Michigan). I showed Samson how to get into the bag and he took to it right away (especially the zipper - he loves chewing on it!). Soon he was climbing in and out of it himself and rolling around in it.
Samson's cage is under a window in our bedroom. When it gets cold out, we shut up the window he's under, but it was warmer out Wednesday night/Thursday morning (the morning he was up before 6am crying) so we left it open some. Last night, we put the sleeping bag in his crate and after he fell asleep on our bed, I picked him up and set him on the ground in front of his crate. He walked right in, snuggled into the bag and fell asleep.
We didn't hear a peep out of him until just after 7am!! We think now that maybe he's been cold, hence the crying. We love having the windows open, and tried putting extra blankets in his crate to keep him warm, but maybe that wasn't working. He seemed to really like the sleeping bag and it looks like it kept him warm. His crate is right next to my side of the bed, so this morning I heard him wake up and whine a little bit, but then he got quiet again pretty quickly (so excited about that)!!! I opened up the door to his crate when he was quiet, he crawled out, jumped up the ottoman he uses as a step onto the bed and showered us with morning kisses!!! Then I got up a few minutes later and we went outside.
Also, he did much better with the water this morning. I did what anta76 suggested - put down his food and water at the same time without worrying that he would have too much of one without enough of the other. And he did perfectly!!! He went for the food first, then had some water, more food, then more water. It was a relief really.
Now my only problem is that all he wants to do is eat in bed while we laze around in a bed a few more minutes before getting up

Seriously, we started doing that when he was just a little thing and now he just runs straight for the bed after we come in from outside in the mornings. He'll also eat in the kitchen if he has to, but you can totally tell he prefers to eat in bed while we're laying there - haha!!!