So, Wands is the Packer. It's phallic.
Swords-T-shots? Bindyboi also works.
Cups-rats work, but aren't quite yonic enough.
Pentacles-Agree with the gages. It fits the disk motif if nothing else.
I've got the Postmodern Art Tarot, the Russian Icon Tarot, and the Science Tarot, as well as the 7th Sea Sorte Deck (Or, let's re-skin the tarot), and the good old Rider Waite.
Either way, Poon and Troon provide a great series of images for the Tarot.
Gunther and Ayden belong on the Lovers.
Still debating what should go on the Tower...