Some trig work can solve it, but your approach is what I most often use, even so far as modeling it in a drafting program to check the details just like you did. The real thing is applying it to wood, with all the slight errors that creep up.
I think you did yourself (and us) by laying this all out before cutting, some fine planning!