Personally, I hope they show the Gorn ship, and use the Star Fleet Battles model for it.
And ya, good one - I'm with you. Lucas showed he was part of the Thought Police when he covered up for Han Solo. And that he had bad taste, when he sprinkled lots of pointless CGI extras into the originals.