Where to put baby to sleep?

Hi there, I'm looking for some advice.

I'm in Canada, and Health Canada recommends the following:

• Room-sharing for 6 months
• Not to leave the baby in a playpen for unsupervised sleep

My son (4 months) has outgrown his bassinet, and his crib is in his nursery. He typically sleeps from 8:00/8:30 pm until 4:00 am (sometimes he skips this wake up) when I will feed him and he gets up at 6:00 and then finally up for the day at 8:00 am. We have kept him beside the bed as it's easier to just feed him in bed and then put him back to sleep. He slept in the bassinet until he was 15 lbs, and has been in the playpen since. I just read the recommendation on unsupervised sleep in the playpen, so I'm not sure what to do, and would love some opinions on what you would do!

Is it time to move him to the crib in the nursery? Do I take up alllllll the floor space in the bedroom and move his crib to the bedroom? Do I leave him in the "unsafe" playpen until he is 6 months?

Tia!