I have many customers dealing with these same fit issues. We have begun, over the last year or so, to move to 650b as there is quite the resurgence in this tire size and new tire offerings almost monthly. But most of these riders are ok with tires 32mm and wider, which is pretty much what is available and sounds like it may work for you also.
I agree, disc brakes make wheel size swapping very possible

best of luck