Breastfeeding woes and triumphs

Kristine • After 6 years ttc, we are finally pregnant. I have an 8 year old son and have been married for almost 10 years.
I EBF. This is a great statement for me to make because it was a very long road to get to this point. My son was tongue tied and very colicky from the get go. He didn't latch for the first month and a half or so. Now he is a champ. 
My problem now is this. He is 3 months old and eats all the time. Every 1.5 to 2 hours. I feel this is excessive. I feed on demand and will continue to do so. I know my supply is good. I periodically pump cause I feel full and I will get 2-4 oz from each side. He feeds for 8-10 minutes. When I pump, I get 3 oz by the 4 min mark. 
Lately he won't sleep more than 2 hours at night and he used to sleep for 7 hours. 
Not sure what my question is, just ranting cause I'm tired I guess. 
Any tips would be helpful though.