Not sure what to do about the behaviour but there are these soft helmety things you can get for bubs to wear...not sure what they are called, but it might be helpful in the short term (for your peace of mind) and help him to get past the repetitive behaviour? Just an idea...hang in there.