Heather - My ds is a bit of everything (spirited, touchy etc) and he had really low A times until about 9 months when he leapt up and has now been on just one nap from 12 months.
I say go with cues - as long as its not just the first A time (so morning nap becomes continuation of night sleep). Much better to have a baby that is happy whilst awake and sleeps well for naps than a grumpy OT one.
I take it he is going down for naps easily and sleeping for long naps? Is he still having a catnap? That is the major change around 7 months.