As you said, the Klingon ship is from Trek XI but that Gorn is modeled after the one in the video game
tying into the Abrams films. It's certainly not the original
or the one from ENT.
Personally I hope Hasbro stays away from Trek (TOS or otherwise) until they've gotten Star Wars back on track. They seem to have lost their way with that property and that's pretty sad.
For the moment, I'm perfectly content to collect Minimates and the annual Hallmark ship ornament.