The gas would have to be pretty bad to cause this and with the tank cleaning and filter, are you saying the gasoline is old??
The injector clicking is a good sign but of course it doesn’t guarantee they are functioning at 100%. Short of having them cleaned professionally, a can of Techron or similar can’t hurt and may help.
Does disconnecting the MAF help the idle? Readings from the MAF, tps, ignition timing, inlet air temperature, knock counts, O2 cross counts, fuel integrator and block learn, may help track down what is going on. Essentially we need to see if something looks out of range, especially when it is acting up