I bought a Wiseco piston kit from Jeff Fredette, and it has the piston, rings, wrist pin and new circlips.
I bought a gasket kit from Dennis Kirk, and I think it has everything in it. I'll know tonight, the cylinder head and various parts are soaking in the parts washer today, tonight is re-assembly time!
If I remember right form last time, the normal top-end gasket kit is missing a gasket for either the shift advancer cover or the KIPS cover. This time I bought a different gasket kit, so we'll see.
Both times I completely disassembled the KIPS valve and the auxiliary valves and took all the pieces out for a good scraping/cleaning.