I agree. It hard work but still early days.

Separate child if you can. Lay him down and walk out. Stop going in every 5 mins as he likely think you coming for him and then when you leave, sets it all off again.

I don't mind the bottles so much. If they can hold it - great. If they can't, then I will but I usually wean off bottles soon after 12 months anyway so maybe that why I don't mind so much as it short term here.