Your working makes sense to me, but I'm not an examiner. You should maybe think about adopting the format in the exam board's marking guide (just to make it easy for the examiner to tick the boxes). Alternatively, you should at least mark up your answer to make it clear that "circle" means current pivot and "square" means previous pivot.