Stuttering after going through water and stuttering after adding gas are clear cases for gas issues. I would run this tank bone-dry, add gas and fuel system cleaner (like techron), and change the fuel filter. But I'd also trust Brucelee's advice over mine as he has worked on one or two more Boxsters than I have, and I'm just speaking from general car knowledge.