We mostly do your second outline, except now I give her milk maybe an hour after her lunch, and then after her afternoon nap she has a snack and some water.
I BF, so it works for me to nurse first thing in the morning because then I can lie in bed a bit longer. LO generally wakes between 6 and 630am to nurse.