While I too would like to retain the cap height and the original look, I feel it's important the the punctuation is correctly aligned. So if the original height can be kept and the punctuation correctly aligned that would be great, but if we have to choose between correctly aligned punctuation and the original cap height then I think the punctuation alignment gets my vote.