Other than that I never bothered with base-layers and top layers:
Your base layer is whatever is next to your skin and top layer whatever is outermost. But I see you just used the same type of garment for all purposes.
I see these layers in this way.
1. Base layer allows sweat to evaporate (else it can’t cool you), plus absorbs very little of it or water, allowing your skin to stay as dry as possible whether it’s raining or sunny,
2. Insulation layer is basically scaffolding for air as an insulator. Generally has hollow fibres and a large surface area. Moves liquid sweat and water away from the base layer towards the outside surface. Not windproof to offer the most flexibility.
3. Windproof / shell. Slows ingress of outside elements such as wind and snow and wind. Allows the egress of liquid sweat and water to the outside. Allows a limited amount of air through (air permeable windproof) to stop humidity levels building if you’re working moderately hard.
You can combine 1 and 2 or 1 and 3 or 1,2,3 as conditions dictate but often you can wear the same combination over a wide range of conditions and temps and remain comfortable neither overheating nor chilling nor needing to stop to change layers every 30 mins etc.
There may also be a fourth layer, additional insulation, you throw over the top (or under windproof) either when stopped for more than a short while or you need a bit more warmth overnight.
The layer principle only works on the basis you actually take them off as well as put them on. Often when cycling we are loath to stop to do that, and even more loath to take off things off when adding a different layer. Adding a windproof / shell warms you up and that might mean removing an insulation layer, before you put them on. But we don’t do this, so overheat, sweat, then chill despite more layers. More flexible layers for wider ranges of conditions often works better in this way as well.