I think if you put him straight after a feed to bed then he is UT, I had this problem a lot, one day he was UT, one day OT, he confused me so much. But you will get there, you will learn to see when he is ready, he is still so little and you two are getting to know each other. But yeah, I know how hard it is.
I don't know if it's the case with all touchy ones, but as someone mentioned here the time putting him down for a nap is extremely short, almost non existing. What you are telling happened to me, he fought me when I tried to sit with him so I started to put him down straight away. Try to separate between the shh and pat, some babies prefer only one of them.