Improved, Robust, Axial Line Singularity Method for Bodies of Revolution