only way we can do is wait out until next month for berlin update to happen maybe it will solve the gas issue.
The problem is whether we can sure the berlin update will be implemented. As far as i know miners against the ethereum improvement proposal that already created.
I do believe we will see another drama when it comes to the voting by the node to update their client into the new version. I hope that will be fixed asap but i will not put a very big expectation to that thing.
berlin is still too far to be a real thing.