Im no expert... still tweaking things myself! But this may help on the catnap readiness:
http://babywhispererforums.com/index.php?topic=64837.0"To be able to drop the catnap dc will need to be able to stay awake for 3hrs. Until then you should keep offering the catnap until the refuse it completely for at least 1 week. It is then time to start increasing their A times across the entire day – always increase a times slowly…10-15min every few days."
And here are some sample 7mo routines where "Average Awake time at 7 months can range anywhere from 2 hrs. 45 mins. to 3 hrs.":
http://babywhispererforums.com/index.php?topic=164030.0"Average awake time for 6 month olds ranges from 2 hr. 25 min. at the beginning of the month up to 3 hrs. at the end of the month."
From what I gather, and the advice I have been given on here, you would need to work on extending his A time first, gradually, which will stretch your day out more to allow for him to drop the catnap when he is ready. Based on my own experience, this may then help with the NWs. Ive worked on things in this order, and now Im dealing with dropping the df so there is less disruption to his night. So one step at a time.
When you feed at 8pm and 10pm to avoid the NWs, does it work? At this age Id expect that it may actually disrupt his sleep and cause him to wake more? But I could be wrong cos anything seems to go at this stage! Im learning that much!!