Sounds like a fair deal. Of course when folks ask these kinds of questions on public forums there are always folks claiming they can do better. Every deal and buyer is different if your happy that's all that should matter.
BTW just the fact you can upgrade to a Gen II for not a lot of money should be enough to convince you to move.
