Yes, that's better and more logical, because it also handles the case where the final punctuation of the outer sentence and quoted sentence is different, like when Dr. Johnson asked "I refute it thus?"!