Yep, sounds exactly like mine.
What I've discovered is that if you create a short routine for naps, a longer routine for bedtime, and rarely stray from the routine you create, they learn that certain cues mean it's sleepy time. Mine works like this:
Naps:
Starting 10-20 mins before putting down, go into bedroom...
"tummy time" (very little talking, if there is, it's hushed) -->swaddle (arms out)-->rocking (5-10 mins, with her against my chest)-->singing (using the same 2 songs every time, still rocking)-->put down on cot drowsy-->a little patting before leaving the room.
The key there is as little stimulation and as much soothing as possible. If I'm lucky I get her down during that "window". If not, she usually fusses 5-10 minutes before finally going to sleep. If I don't get her down during that window, she needs to fuss a little with no further interfearance from me (I seem to make it worse) in order to get to sleep...not sure why, but it seems to work. Sometimes I think spirited babies honestly can't handle a lot of "help" from parents to get to sleep after they've learned how because it's too stimulating. However, I do check on her and sooth a little if after 10-15 mins she's still struggling to get to sleep.
Bedtime:
Between 6 and 6:30:
Bath-->dressing-->massage-->swaddle-->bottle and storytime-->bed.
Bed between 6:30 and 7.
She doesn't always drink the whole bottle, but this is usually a clusterfeed anyway.
I also have found that tummy sleeping works all the time, because she can reach her thumb, and she can't see anything above her crib. If she's put in on her back, doesn't matter how tired she is, her eyes pop open and she wants to play. Maybe she'll take a nap, maybe she won't. She mastered head control, so I'm not as worried about SIDS.
Occasionally if she's having trouble sleeping, I use the swing until she's just about to fall asleep, then move her to the crib.
Hope this helps a little
*HUGS*
Sonya =P