Well done. Your modeling will take a big a step forward now. Here’s another way I deal with singularities. I use extract iso curves and projected curves to trim out the singularity with a four sided opening. Then patch in that hole with a surface from edge curves.