Erin, sounds like you are doing all the right things. Our bubbas are the same age and DD has just started to kick in with her fussiness and cluster feeding, especially since the weather is quite warm at the moment. She's on my boob, well it seems constant, between around 5 and 9pm. I'm just going with it because I figure the more she is feeding, the better my supply will be (hopefully!). During the night, I have also brought her into bed with me after a proper feed and we lay skin to skin and she just nuzzles at my boob and will have more drinks while I get to lay down and lightly sleep (can't fully sleep properly when she's on), so I get some rest.