Not really, changing the throttle curve is going to do just that. I am not exactly sure what the issue is, the way I see it...
Quad is on the ground, arm and no motors spin, flip SWA and motors spin, take off and fly.
Perhaps 25% is too much for that scenario, and BTW 3.5% digital idle on DShot is a little low, you may run into stutter or desync issues when you goose it from idle and it will leave you with less authority in Air Mode too so just watch out for that.
That is just another reason in my book to spin props on arming, any armed quad that doesn't spin is an accident waiting to happen in my book.
And I will not configure any quad with a single switch arm unless it is set for double toggle.