Do you have a routine? I always believe before we look for other causes, go back to basics. A routine. That is usually the cause of many unsettled sleep patterns for both baby and adult. Also when you say 2 hours at max, is that for nap time? Once he wakes up what does he do?