Need help getting baby to sleep in bassinet!

My son is 10 weeks old and sleeps in a rock n play. I'm trying to transition him to sleep in his bassinet before I head back to work in 2 weeks. I made the mistake of having it rock ALL THE TIME while he was sleeping at night and now boy, am I paying for it trying to transition. I'm a FTM and I wish I thought about that first. I have a wedge to put in his bassinet but I don't think it's the elevation for him I think he misses the movement. So when I try putting him in his bassinet he sleeps 20 minutes tops. The bassinet does have a vibration feature but shuts off after like 5 minutes 😠 so when I put it back on it makes him jump. I figure I'm going to try putting him in there for naps to start..I just feel bad cause he'll go all day with 20 minute naps and be MISERABLE. I swaddle him with hands out at night (he HATES hands in) play white noise, etc.

Also if he wakes up I'll try to calm him by giving a pacifier and he'll fall back asleep but wake when it falls out.

Any other suggestions or things I'm missing? Thanks everyone!