If he attends the church, he has as much right to be there as you do unless the church leadership chooses to send him on his way. If you truly feel he is that much of a threat, you should approach your church leadership about the issue. If they cannot make you feel safe, you may need to find a new place to worship. What was the underlying reason for his attempt to hit you?

You can try contacting the supervisor of the officer who responded to see about upgrading the charges but sometimes it comes down to what they feel they can win. You stated the video only shows him swinging, not making contact, and you had no visible injuries. DC is winnable here although they could charge assault to get a plea but don't hold your breath.