I support the previous suggestions, especially Ted Shifrin's fine notes.

I am quite ignorant of differential geometry myself, hence am sympathetic to this proposal.  I have recently realized, through my love of Euclidean geometry, what others all know, that there is a natural sequence of topics: euclidean geometry, spherical geometry, hyperbolic geometry (these all being surfaces of constant curvature), and then other surfaces of constant curvature, namely quotients of the previous ones.

Next one naturally progresses to surfaces of varying curvature, i.e. the realm of differential geometry proper, Riemannian surfaces. Finally one raises the dimension.

Thus the natural elementary course to teach seems to me to be spherical geometry, then....

The point is to teach curvature, and emphasize that euclidean geometry is the unique geometry of constant zero curvature, (with another hypothesis that lines are infinitely long).

In particular we seem to miss an opportunity when we teach non euclidean, i.e. hyperbolic geometry, without a link to differential geometry via curvature, but this is normally done in non euclidean geometry courses.

E.g. curvature is easily presented in the elementary way that Riemann (and Gauss) described it, as the defect of the angle sum of an infinitesimal triangle.  Gauss Bonnet easily follows for the basic surfaces.

Along this line of reasoning, John Stillwell has a very nice book on surfaces of constant curvature that would impart a lot of useful concepts at the advanced undergraduate level.