I think you're doing great to be getting 4 hour stretches through the day! Mine are too cheeky for that
DS & DD both did the same at night til they were about 8 months old. DD is still sooky at that time, but more from boredom & being left alone while I cook dinner.

DD is waking once or twice a night atm, but that changes all the time. Depends if she's sick, or teething, or something else is going on.

You could try a cup of EBM in the evenings? Or water for something a bit different.