This is an excellent story, and it's been one of my favorites. That was a great ending point, though I sort of expected an epilogue that shows the wedding, as well as if Harry Potter ever comes out of hiding.
That being said, I do have one minor nit-pick about one line.
"Avada Kedavra," he said, pointing at Cedric. Harry pushed the Hufflepuff away from him and the spell's path. Cedric fell onto the cup, and both disappeared.
When I first read this line, I thought that both Cedric and Harry were portkeyed to safety, not Cedric and the cup. I'm not the only person who thought that.