Do you have a rocking chair?
We invested in one this time and it has been a life saver. I found swaddling really tight also helps heaps.
Also 6 weeks was when he's colic peaked and has been slowly getting better. He is 11 weeks now and really only gets bad when he is tired, still a catnapper but if he is not super overtired he is much easier to settle now.