I would stick with the original plan, that way there is no way to be disappointed.

You mentioned it has everything you want and nothing you don't; I think you answered your own question.

Plus don't be fooled you will still be paying them extra cash (It ain't coming free)