Overtired baby ... please help!

My 1month old has been fighting sleep at night as hard as he possibly can the past week. We seem to get to around 8/9pm and it starts until he eventually falls asleep around 12/1am.

I take him up to a dark room (have a groegg which is dimmed down), put him in his swaddle, feed him, wind him, put on the whitenoise machine and try to get him off to sleep. He gets himself to a point where he is overtired ... starts screaming, stiffens his whole body, pushes his body away from you and sounds very angry. We had previous issues with wind but after introducing gripewater he now brings his wind up well. We have crying on and off (mainly on) for around 3hours before finally drifting off! Also, I can no longer put him down in his moses basket partially awake. I have to get him completely off too sleep before setting him down otherwise we start the whole process again. He used to go down well, but not anymore! Once he is down for the night, he will wake up for a feed then go back off again throughout the night. It's the initial start of bedtime we have issues with.

I have tried an early bedtime, put him down at 8:30pm and he was up again by 9:15pm and that was it!! Crying for 3hours. I have tried a later bedtime and the same thing again. We've done bath time before bed (he loves his baths) but it makes no difference.

He mostly sleeps well during the day but we do sometimes fight naps during the day too. This fighting doesn't last as long, usually falls asleep after 20ish minutes. We do alot of contact naps. Sometimes I try to put him down in his sleepyhead or pram but he will wake shortly after.

I'm at my witts end. I don't know what else to do! Can anyone please help?