I only just read this now, so glad your getting it sorted.
I was going to suggest microfleece also for going against his skin, and mentioned that when my DS was about yours age, we realised that he seemed to be mostly saving up and doing an enormous pee as soon as he`d start to wake - so then we knew we just has to get in there pronto in the morning to change him.