We're on pretty much the same schedule here. When we've had a good nap day, I just move her bedtime feed up a bit (as early as 6:15pm depending on her mood), otherwise, she will fall asleep while eating and not take a good feed. If she doesn't take good naps or is otherwise off-schedule, I put her down for a catnap, but no later than 4:30pm, and I don't let her sleep longer than 45min.
When she does catnap, how long does she sleep? Have you tried feeding her early, say around 6pm?