Chirp, chirp...
Looks pretty good, I would clarify that the Marriott card cert is a category 1-5, not just a category 5, that might not be intuitive to everyone.
The real downside to these packages is the fact that you need to use all the nights in one shot. That's what had held me back this whole time. I'm not sure if this changes anything for me personally but the resale value of the certs should go up after the changes.