I'd look at the fuel trims under all normal operating conditions. If you're beyond +-10%, it might pay to fix that first as well as making sure that there are no exhaust leaks.

I've solved a few Toyota cat codes by "addressing" a dirty MAF s... Login to read more.