I'd like to see both as well. I think it would show the Klingons as a more complex culture. I liked the way they showed them in Star Trek VI. They seemed almost like a mix of the two kinds, they all had ridges but were of different prominence. I just hope they don't all have ridges and look as they do in TNG, the Klingons of TOS were not only physically different but acted different as well and I think in Trek VI they showed elements of what the Klingons were in TOS without just lifting that conception of the race out of the series and putting it into the movie.
"Death, delicious strawberry flavored death!"