Hi,
thanks for your report, great review, definitively the best I've read
If you want to remove or put back the diamonds in SP, you can do it : just push the X button for few seconds, a menu will appear, select the diamond.
it will remove all the hud helper like diamond and arrows.