I think you're right. While the UAE doesn't execute people for pedophilia, per se, the homosexuality element was what allowed for it.
The state law in Washington even had a similar issue. Bestiality was prohibited by the sodomy statute, which the state repealed in its entirety as a gay rights thing. After the Enumclaw incident the legislature scrambled to re-criminalize bestiality.