I feel your "pain" and actually have the same issue posted a few titles down...
How is the night lighting in your room?
I removed the night light I used to have in our room a few months ago, and that made a dramatic difference since he couldn't see in the dark to play, though lately, he would still babble and feel his way around in the dark once his eyes got adjusted (alarm clock puts out some ambiant light, but I need it). He is also a heat seeking biter lately, with a couple new teeth coming in and can't wait to sink his teeth into any part of my available skin, so that takes up some of his time.
Also, I just spent the past month nightweaning, and DH would take over co-sleeping duties as soon as DS was done nursing (I would leave the room) and he was able to get DS to sleep in 10-15 min. My jaw would drop watching it on the baby monitor!
Naptime during the day has continued to be a struggle since the room is not dark enough even with room darkening shades. I spent 90 min both yesterday and today in bed with DS and finally gave up on his nap since it got too late in the day. On the upside, he fell asleep in 10 min last night and in about 5 min tonight. But, I still feel that he needs to nap during the day, so the issue remains about how to get him to fall asleep. At least DH is here on the weekends to takeover naps since he has the midas touch. I just have to worry about 5 days of the week.
I might try getting him back in the crib (suggested by other posters) that has been used as a repository for our clothes so far. I think I'll try taking off the side rail, but now that he's a toddler, I have to have it at the lowest setting, which makes for a big gap with our bed and his crib mattress, so not sure what to do for that.
Best of luck. I know how you feel...