@reekypear Go for the crib. If we had space at the time this is what I would’ve done I think. My son got out of his next to me when he was three months old which is a right pain!
We basically got a dresser and then added a changing mat on the top of it, and he still uses it even now at 19...