I think your prelim sketch is on the right track. Looks good.