Local pickup solution for Recharge Recurring Orders

I am currently using Recharge for recurring subscription orders. I had to install a pickup app (Store Pickup by Genie Apps) to give my customers the option of picking up their orders since Recharge isn’t compatible with Shopify’s native Local Pickup option.

However, since the Store Pickup app functions by adding a “Pickup” product to your cart at checkout that forces the shipping cost to $0, when my recurring orders come through, this product is no longer a part of the order and my pickup customers are being charged for shipping.

Does anyone know of a Pickup app that works better with Recharge, so my recurring orders can retain “free” shipping when the customer selects pickup? Thanks!