Inconsistent idle/off throttle surging

[Robby45]

Looking for help on two (maybe related, maybe not) issues with an '11 300 ec.

First issue is the engine is stalling (while throttle is shut off) during hard riding especially on uphills/downhills. The idle works fine at rest although I have had to turn the idle screw in nearly all the way. My first thought was float height, but it looks to be ok. I have had this issue since the bike was new.

The second issue just started last weekend: the bike surges while the throttle is shut. Just quick short blips that while coasting with the throttle closed cause the bike to accelerate every so slightly. This started (I think)after I backed the the air screw out to 2 turns to try and get a higher idle to fix problem #1. I have enough slack in the throttle cable so I can't figure out what's happening here.

Carb set up:
175 Main
38 pilot
stock needle ???
air screw 2 turns out
not sure which model carb, but the bike is an e-start with ohlins/marz.