Yes, I did dress correctly, for me and for my current riding style.
I think the people who designed the PI Therme Fleece tights should win some kind of award. I was a distance runner for abouut 25 years, and with my Nike connection was able to get good technical running wear. Now after my knees stopped the running and I am biking, I am learning about biking wear. So far, I am very impressed by the products.
I wore a long sleeve bike jersey under a rain jacket, and a skull cap between my bald head and helmet.
Based on my much more competitive running days, I would think you could never have worn this much clothes given the higher intensity of your ride. It appears to me that the difference between 15 MPH and 18 MPH is only 20% in raw speed, but I would guess the effort required to do that to be at least 50% greater.