Glad to hear that the nappies and his tummy seem to be better. As for the sleeps, some babies will just drop them and be fine. The more you fight with him over it the more he is going to fight back. The only thing you can really do is watch for his tired signs and pop him into bed as soon as you see them.