Not all FI cleaners are the same. Most do not work as advertised. For over the counter, I would go with Chevron Techron Fuel System Treatment. I personally prefer to use Fuel Power. You can find them from Lube Control Distributors online. It works very well at cleaning the fuel system and making the engine run more efficiently. I add it at every tank or so. I get about a 1 mpg increase.
For once a Oil Change Interval (OCI) cleaning, I like Schaeffer's Nuetra. I would add it to the tank and use it up before I change my oil. That way, any insolubles that make it into the oil are drained out.
And you thought an obsession with wax was bad...