I actually drilled holes for p-bolts, GIMBS would have also been an option. Mainly because i had plenty of p’s at the time, not for any reason of preference.
I gave some gear to neil to finish off the job, but neither of us have had the time to get back to it.
So i would say all p’s and a separate anchor for the 16. As the existing anchors are orientated towards razzle dazzle and are a bit funky when loaded down the 16