I think you did the right thing by uping the fuel octane and adding the fuel injector cleaner. I would try that for a least a couple of tank fills before repacing anything. I always believe in trying the cheap method first before actually replacing items on my vehicle.
Hope that clears it though. Good Luck
