Just look at it this way....it can't be comfortable for her to sleep in that pack n play or safe if your still using the bassinet. Thae bassinet part is not meant to hold a small baby over 15lbs. And in the playpen "mode" it bascally a lightly padded piece of plywood!! Ouch...talk about back ache
Why not slowly transition her to her room....move her outside your door or another room on the first floor for a few days and then move her a bit father away for a few more days until she is finally in her own room and her own bed!!!
Good luck....being a momma is sure a tough job some days!!!