Just popped on to say that sounds frustrating for you
I'm no expert, but a couple of things to consider...
1. dropping the DF cold turkey - we did that a few months ago, as we decided it might be disturbing her sleep, and we figure we were right. You can fade it out slowly, or as you are up so often at night anyway, my hunch would be to drop it cold turkey for a few nights and see what happens.
2. You may want to post on the EASY board - although your LO is napping for reasonable times, I think you may need an increase in A times - that could give you better naps, and then better nights.
I'm sure someone with much more experience might have other things to add, just wanted to drop in with a reply for you so we can try to start getting you some sleep!!
H