okay meg. sounds like you're getting into a routine that revolves around her. that's great! i did the same w/all 3 of my girls. not a schedule, but a routine based on their needs. and her needs/moods sound exactly like all 3 of my girls.
wake up happy at same time - chilling out while i do chores in the a.m. while they are in good moods.
2 hours later - ready to nap. that is so awesome that you can walk for 2 hours! fresh air. exercise. she gets a nap. the dog gets walked. if nothing else, you should feel like you are doing a great job just from that 2 hours!!!!!
as for the free-for-all, that's pretty much us too. i feed on demand and she can sleep on demand, but rarely does. i found this was the best time to schedule playdates and other activities w/my infants. i did my chores in that a.m. time while they were in a good mood. i let them have their nap (and often napped when i could too - or used this as time to have 'me' time or get chores done if it didn't work in the a.m.).
you might want to do the nap thing at home if you can swing it. she can nap at home from let's say 10-noon. you can do your chores while she's napping. then when she wakes up, have some lunch together - if she's grabbing at your oatmeal, she might like to try a little food. nothing big, but ya might think about it if she seems interested. my kids always seemed to start around 4mo.
anywho, after lunch, then take your walk. she's more aware now and would probably get a lot out of the fresh air and different things to see and that stimulation might keep her from being moody, kwim? so if you're still doing 2 hours, that takes you to 2pm.
maybe chill out at home as she'll probably be worn out from walking (as would you i'd imagine

) nurse her while you read a book or watch TV or log onto MDC. have some down time but together at home time for a few hours.
so that takes us to 4pm - hmmm... what to do? this is usually revving up for the "witching hour" as they call it, but my kids have usually been ready for a nap around now. so if that's so, put her down and if it takes some time, so be it, snooze w/her a little and then get up to make dinner a bit earlier if you can?
5-6ish have dinner. and here's where i suggest a change (though it never happened at my house until my girls were older, so take it FWIW) - have DH give her the bath! you can still do the massage, but give him some 1-on-1 time w/her. my dh likes to get right in the bath or shower w/my girls. that way you can have the 10-15 minutes of bath time to yourself to um...breathe or something novel like that. :LOL
then maybe you'll be up for the 20-60 minutes it might take to get her down for the night b/c you'll at least have had a few moments to yourself just prior.
and for night feedings and diaper changes - PLEASE! do not fret. all 3 of my girls have spent all night in the same diaper since they started "sleeping through" as long as she's not getting rashy, do NOT feel guilty about this. sleep is of much more importance IMO.
i'd involve dh a little more there if you can swing it. not like handing him the baby when he walks in the door, but a few hours later for bathtime would be good for HIM, good for HER, good for YOU!
hth - not that you even asked for advice!

: - and it's 1am here so i'm up too late too!
Follow Mothering