I don't see him staying either, but then again, my knowledge of canon is still mostly gleaned from reading episode reactions and meta, as I still haven't had time to catch up on the episodes I've missed.

Yup, the point of view definitely worked for me, I think it was a wise choice. You deserve lots of feedback for cheering me up :-D