Need to extend wifi without ethernet cables

Our church is a large brick and block structure. It is extremely expensive to run ethernet so I'm looking at Orbi Pro as an option. Here is my current setup moving from ISP to users:

Internet modem (SMCD3G) and service provided by Comcast

Ethernet cable runs from modem to a Dell SonicWall SOHO

Two ethernet cables run from the SonicWall to:

1) Netgear 16 port switch (from which all ethernet data ports in church are connected)

2) Netgear AP Wireless Management System WMS5316

There is an ethernet cable that runs from the WMW5316 to a Netgear ProSafe GS108P to which three Netgear WNDAP360 are attached with ethernet cables.

The three WNDAP360 are located: on the ceiling right outside the data closet, upstairs outside the office suite, and in a closet near the data closet, but an external antenna is installed that allows the signal to go down the hall toward our fellowship hall. (The two story building is about 80' long.

Last year I purchased and installed three AmpliFi MeshPoint HD to extend the wireless signals along that long hall thinking the wifi signal could skip along the meshpoints. (I did not install an AmpliFi router.)

I still need a stronger signal in our fellowship hall, though. I can't get ethernet into that room due to thick walls and fireproof doorways and fire walls.

Would Orbi work? Is there another option I haven't considered?

Thanks