He is still very young so wanting to be close to you is natural. He has been in the nice cosy, warm womb for the last 9 months after all
if you are getting one nap a day in the Moses basket then that is good.
I would persevere with the swaddle even though it may seem he is fighting it. How long is he awake before you swaddle him for the next nap? I'm wondering if he is already OT by that point. What are you using to swaddle? My DS2 preferred a stretchy, ipped swaddle like the woombie to the tight miracle blanket for example.
I will ask for some bottle feeding eyes for you as I'm not sure what is normal in newborns with regards to bottles.
It would help us if you could post your typical/most recent EASY (I'm sure they are all different at this age) so we can see how his feeds and sleep fall.