Congrats on your new camera. Welcome to the full size club!
The Nikkor 16mm fisheye would be the best choice for this camera but would require a minimum of 6+2 shots.
Shaving the Nikkor 10.5mm is a good option (as you have already done) but will not give the clarity or maximum pixel size of the 16mm. It really just depends on what you want out of it.
I'm guessing you have the NPP sorted now?