Heather- I have a similar issue. We are thirsty people- DS1 nursed like mad, and now drinks insane amounts. DH and I are the same, so I imagine DS2 is also. Probably not what you want to hear, lol, but we do a full feed when he wakes up and a shorter 'drink' before nap or whenever he starts pawing at my shirt
I just try to keep the full feeds 3.5-4 hr apart.