I agree with the others, Shoha is just the symptom, Tsubame Gaeshi is the culprit. I would prefer adjustments to Tsubame over Shoha. If they want to stick to their guns, maybe a single extra Shoha charge, just to avoid that one Shoha between Midare and Tsubame.