You've said everything I could ever say about PiHKAL; it's a masterpiece. TiHKAL, published three years after the Shulgin's lab was raided by the DEA, is also a fantastic read.