I think you found your problem JrBoulder.
I had the same two codes in my 99 and it was keeping me from passing smog.
I built a smoke machine, looked all over for a leak and replaced a bunch of parts with no luck. Oil cap, gas cap, air flow meter, etc.
The final thing I did was replace the AOS Bellows and that solved the problem.
