As promised, here's an update of how our afternoon nap went yesterday.
DCG - cried for about 20-30 minutes, slept for 40-50 and cried for the rest of naptime.
DS - cried for almost 2 hours :-( napped for 45 minutes. DS also woke up twice through the night last night, which hasn't happened in months.
I'll let everyone know how today goes.
Again, thank you to everyone whO has taken the time to offer advice and support. You have no idea how much more optimistic I feel knowing that I have a community of experts to go to for things like this.