The amnesiac on Castle tonight was So Familiar, but I could not place him. IMDB to the rescue. Marc Blucas, who played Riley Finn on Buffy.
I am really confused, actually. I didn't much like him on Buffy (because he was replacing Angel, most likely) but he was utterly mesmerizing on Castle.