oh heck no, naps have always been difficult
she has only rarely napped for more than 30-40 mins
She needs 2 naps per day min at the moment or gets so overtired and grumpy - sometimes will fall asleep on the boob, but much less these days, otherwise its buggy or car - which doesnt work if I need to stay in for some reason or am out and she isnt tired enough when in buggy/car
I think overtiredness due to lack of day-time sleep is a big prob with night-time waking - but I have no advice at all as have totally failed to make real inroads myself
Dd was daddy-resistant at nights too for ages - obviously due to bf and wanting boob. dh would try to settle her to give me a break and she would cry and cry and I would leap out of bed and scream 'oh give her to me then so we can all go back to bloody sleep'. So I know what you are going through there.
Oh how frustrating when you have spent ages getting to sleep and easing of the boob and then they wake up screaming as soon as they touch the cot. I really really feel for you.
I was knackered tho so had to increase dh role massively and she did get used to him. That doesnt help in your situation with your dh being away alot.
Thing is - you have made progress, albeit small step. Stick with your plan, and little by little you are sure to get improvements. I really really hope things get even better for you.