Man faces more assault charges ahead of civil commitment hearing