4 month old going back to feeding less than every 3 hours.

My son just turned 4 months, he's EBF. Since birth he's been every 3 hours sometimes close to 4 and then he was doing one night feeding. He had gone up to 8 hours at night a few times. The past 2 weeks however he's demanding to nurse every 2 hours, even through the night. I know he's at the end of Leap 4, is that what the deal is? I'm very aware that he needs to not nurse for comfort but when I spend a ton of time and energy looking for other ways to get him to chill out, then nursing is the only thing left to try. I don't want to form bad habits but I also don't want to drag him out to 3 hours because then it's just brutal crying until he gets fed. Heeeeelp. Lol.