The quad vickers were fitted as shown on your drawing approx. 1938 but your honest comment of inaccuracies on the drawing are correct, the bridge wings in particular had been dispensed with in 1935. Those wings were specific to Aust and Canberra only.
The quads were relocated as you stated.
Whilst there is a varied report of the Mk of the 4" guns fitted in the waist, I would be interested if you have official documentation that they were Mk IV`s ? The Mk V had been developed before 1928 and was unique in layout.
The saluting guns had been landed before her early 42 refit, but you are correct that images are inconclusive, they are definitely not fitted after refit.
I have sent you an email via webpage comment block.
All the best.