So, after months of trying to figure out a solution I finally gave up on trying to have one bike for trail and street. With only Class 1 allowed on trails, and 20MPH being too slow for me for the street, the only answer is 2 bikes. I was sure I was going to buy a Levo Comp or a Giant Stance Pro 29, but then had a last minute change of heart.
So I ended up buying a 2020 Vado 5.0 and set it up like a gravel bike, with Panaracer Gravel Kings running tubeless. Can't ride the trails but it'll smoke everywhere else! I guess it's sort of an in-between solution. Once I get over the shock of this purchase, which will take a while, I'll start looking for a mountain bike...
Thanks again all for your input!