We pick up his water about 8pm every night but he was still getting a little food (treats) so we will try cutting them out after 8 as well.
I've ordered the heartbeat pillow you suggested so hopefully it will help.
Nice to hear that other pups are the same as Muffin, makes me feel more relaxed about how he is progressing.
Thanks everyone