Unfortunitly this is a common problem. Its a hard one to brake with a spirited baby too, they can be very stuburn. Be prepared for this to take up to a week, possably more depending on how spirited your LO is.
Do you rock to sleep for naps and night sleep??
I would actually recomend that because you have a spirited baby you try this tacktic. Its one I used for my LO and it worked. It took a bit of ajusting to fit her, but after 4 nights she now sleeps all by herself at all naps and bedtime.
Instead of rocking or singing him into a sleepy state you'll need to watch very carefully for his signals that he's tired. Because you have a spirited baby PU/PD may not work. When you sing to him your stimulating instead of soothing.
For naps try 45-50 minute intervals for putting him down and just pat/shush if he cries, try not to pick up as it will over stimulate.
For betime routine try a bath to sooth and relax him, Johnsons & Johnsons soothing bath works great for settling fussy babies. (you can use a genaric brand too, just make sure its lavender as its soothing and makes baby sleepy) Sing to him while he's in the tub or while your dressing him. If you sing in the rocking chair you'll over stimulate and wake him up and you'll not get him into sleep.
Then after bath put him into PJ's darken the room and feed him his last bottle, don't talk or sing to him. This will help relax him. If he falls asleep eating its ok as long as its not an unbrakeable habbit. Once he's finished his bottle, lay him down for sleep. (Swaddle if you swaddle, give Paci if you use it) Then leave the room. Use pat/shush if he fusses, and again try to to do PU/PD as it might overstimulte and keep him from sleeping.
When doing pat/shush you may only need to do the patting part.
As I said this could take 3 days, it could take a week. It will work. Just be confident in yourself and your abilities.
If you have any questions feel free to ask.
HTH