Congratulations on your lovely baby!!
I think they say swaddling is fine till about 3 months, but I think some people carry on much longer than that.
If it's working for you know, I'd carry on!!
To get them out of the habit, I think you start by leaving one arm out, then the other, but I haven't done it myself, so I can't really talk
With the settling in the day thing, I wouldn't worry at this stage, as long as it's not driving you too mad.
In a couple of months time, if he's still like it, there are various techniques you can try to teach him to settle himself, such as the shush pat technique, that the Baby Whisperer recommends.
But 6 wks is very young - you may well find it sorts itself out as he gets a bit older.
HTH