I'm not very experienced, as my bub is only 16 weeks old, but I was formula feeding him every 1.5 to 2 hours on demand (was driving me insane) and all of a sudden he snapped himself out of this habit and started feeding 3 - 4 hourly at 12 weeks, so as a last resort you could try more frequent feeds (if he seems hungry) during the day. But I know that you know your baby best, and trust your instincs.

Also, are you using any bed-time routines/cues? Might help with the night sleeping. EG, we have a sea-horse toy whose tummy is a soft night-light when pressed and it plays classical music softly for 5 minutes. Or anything else that you can think of.

If nothing else works, know that this too shall pass!

You are doing a great job