I'm getting a P0496 & P0497 check engine light code. I have already replaced the Vapour purge value and the gas gap. But, after two weeks, the CEL came back with those same codes. Then I went to look for any leaks from the hoses connected to the purge value and the vapour canister (located by the gas tank). Couldn't find any. My plan is to replace the vapour canister unit. Would this be the next correct step?

Thanks.