No, you are not over doing it. You still need to take him out every time he wakes up. What you will notice as he gets a little older is that he won't nap quite so often therefore he will probably be holding it longer. Sounds like you are doing great!
