PinkPalace - hang in there - the naps at 4pm and being up until 10.30 or so were exactly the same for us. It was the transition time for giving up the day naps here - really messy. DH and I also fought - really difficult to manage.
I ended up waking her from being flaked out on the couch after 45mins - VERY MESSY - not for the faint hearted. The best thing here was us getting consistent which meant I had to do it ....ridiculous as it was BUT it did get better.
Massive
PS - Trust your instinct with what you think will work best - I should have done it far sooner than I did.