Hip detail?

[junglejim]

Looking for some advice on how to finish this hip and match into the roof? Am I right to think dry ridge on the hip, angled cut at the top and lead flashing tucked under main roof tiles? 

note: the glazing is going to be changed to 2 rectangles between rafters rather than along the hip (something else I’m trying to work out!)

 

 thanks for any tips.