Thanks Steve, the shipping from the UK makes that single 6i painful. And Landon is correct, mine are Gen1.
I picked up some random new 6i head off ebay 6 months ago. It looks about as close a match as you can get, I just need to steel wool it to get the shine off. But I'm still watching for that lone 6i P2 head. I actually finally got around to shafting the P2s up last week after having the heads sit in my garage for nearly a year.
Landon - a decent looking set of G40+ heads is on ebay for $35 shipped. Not P2, but probably close.