Thank you all for you recommendations.
I will try to look at TT, Math without Boarders, Derek Owens, Jacobs & Jurgensons.
Derek,
Thank you for the additional information on WHA.
Leslie Smith still teaches the Geometry so I am especially thankful to know you were happy with her class.