I'm a really cold sleeper; I'd go with the thickest CCF pad you can get. Put it on top of the NeoAir.
Also, your NeoAir (or any insulated air pad) needs to be blown up to the maximum to have its full R-rating (see the recent articles on insulated air pads). If you had it soft enough to be comfortable for your prior trip, that was part of the problem. If, like me, you need it soft to avoid painful hips, consider a Ridge Rest for on top of the NeoAir.
When I tried a NeoAir in cold weather (18*F), with a 1/8" GG Thinlite pad, I about froze. It was obviously the pad since no matter how I lay, I was warm on top while the part of me against the pad was shivering! Experimentation came up with the warmest combination being the pad blown up full and hard and the Thinlite on top rather than on the bottom. It still wasn't enough, but at least I got a few hours' fitful sleep. Every time I moved, though, I rolled off the pad! And I moved a lot because my hips got really sore!
The justification for a quilt is that the sleeping bag insulation under you is squashed to maybe 1/2 inch, so the part under you is wasted insulation/weight. However, the part under you is not zero insulation, just considerably less than the fluffy down on top of you. That's one reason I prefer a sleeping bag to a quilt, and would want a warmer pad if I did use a quilt. The other is that I toss and turn a lot, and since childhood I've learned to take the sleeping bag with me. With a quilt setup, I'd probably end up with the sleeping pad on top! Your mileage, obviously, may vary!
I read your other thread; be sure to take the down pants, warm socks or down booties and a balaclava!