The DVDs don't have any teasers during the credits so you should be fine now.
Though I think the DVDs themselves have a spoiler on them for Season 6. Not much you can do about that though.
--
No amount of planning will ever replace dumb luck.