Do you have a wind down routine before every nap and bedtime?
That helps heaps with
DD. Before every sleep is an exact sequence of events so she knows whats next, and it forces her to stop playing so she can relax and get sleepy.
Into sleeping bag and given her dummy
Read a book or two
Into her bouncer to watch me cook, watch some Dora the Explorer or watch whatever is happening in the house
Into her room for a cuddle and song
Into bed
And YES it will pass! Hang in there!