Help! I had the rock n play!

I had the rock n play and my little man slept really well in it. Only waking up once or twice in the night. With the recall i put him in his pack n play and i was up with him every hour and a half. What can I use either as a co sleeper or bassinet that will work until he is 1 years old? Most have a 10-20lbs limit but I want him in my room till he’s at least 1. I’m thinking something like this (photo) that i can use as a co sleeper but i would like to make a frame for it so it is also a bedside bassinet. What are you using and what should I do?? It honestly is giving me anxiety and I need some sleep 😴 any advice helps 💗