I have the same CELs. Will be changing the charcoal canister and the purge valve. Also replacing the hose from the valve to intake since the old one has become too stiff.
If you search around you can find OEM parts at less than what your local dealer offers. Eg. My local dealer wants $400 plus...