They can't be leaving Amy and Rory behind

Looks like it!

he did say he'd see him again (or the other way round) I think

he did say he'd see THEM again

He's gonna harpoon them