Yours is the appropriate course of action. Churches who desire to get out of the business of authorizing marriage licenses can do so. The legal part of it is done at city hall or in Las Vegas. At the church you have a religious ceremony.
You could have a judge perform the civil ceremony right before the religious service. That would remove the threat of lawsuits.