I've got a project I need to post where I had this detail. I went with option 2. It went well with a mortiser and a tenoning jig. Nice write-up.