Well, I have switched tanks and the problem seems to remain. But then again, I switched tanks while it was idling and already suffering.
Today will be a trip to the fuel station with loose caps and then fill the tanks and see what happens going down the road.