The nap does seem a little long but only by about half an hour though a 5 hour wake time before bed time seems ok, this is what dd has. The trouble settling at night could just be a phase, dd went through this 2 weeks ago out of the blue and I did walk in/walk out and actually put her to bed 5 mins earlier not a lot I know but seems to have helped.
Since we have gotten back on track though it's taking her longer to settle for her nap, I put her down at 12.30 and it's almost 1 before she sleeps now so she suddenly only has 1.5 hours, she wakes cranky but I am ready for her and usually have a task ready that she enjoys, reading books is her favourite and it allows her to get back into her day slowly.