I found when solids were introduced, they really become a part of Activity time. My dd often feeds not long before napping, I think the main thing is really related to feeding to sleep. Here's how our day looks with solids in there, I don't wait 2hrs, but offer after 1hr. she's 8mths old and this has how it's looked for the last month.
6.30-7am wake and breastfeed
7.30-8.30am breakfast (when I get the chance to feed her really with the morning being so busy)
9am nap (1hr)
11am breastfeed
12pm lunch
12.30-2.30pm nap
3pm breastfeed
5-5.30pm dinner
7pm breastfeed and bed
Since you're finding she's too tired and you're feeding quite close to nap time, I'd just bring the meal in by an hour, it's not really a set rule, just see what works best for your lo.
HTH