I hear ya on the unsettled nights! My DS was pretty bad for a while there.

Your DS sounds like he is doing pretty well with his day naps anyway! I reckon if you put him to bed a little earlier at night (like I said above), he may sleep better for you throughout the night. For some strange reason babies can have really unsettled sleep when they are overtired. Why don't they just sleep deeply like the rest of us?!

I hope the cloth trick works, it is definitely worth a go!