Gen 4 Suspension OEM Strut differences

Hello all,
I am posting about OEM suspension differences, and hoping to get some insight from experienced members.
This does NOT relate to aftermarket suspension set-ups.

I am going to replace my struts and or springs by making my own assembled piece. (I can not find and OEM one pre built). This will be for both front and rear. My car is a 2017 Prius Two.

First of all regarding suspension differences between 2016-2018 I understand there is a difference between the suspensions of touring and non touring. Although when putting in both types of cars (touring vs non-touring), I am getting the same spring and strut part numbers for either version car.
Right Side Strut Front: 48510-80815
Left Side Strut Front: 48520-80492
Springs Front Right and Left:48131-47180

First question: Have the Non Touring model struts been superseded by the Touring model?

Next question: Are the 2019-2022 Struts and Springs any different from the 2016-2018 Touring vs Non Touring Struts and Springs?

Third question: Also Are the 2019-2022 struts and springs compatible with 2016-2018 models? (I assume they are but the part numbers differ.)
Right Side Strut Front: 48510-80A77
Left Side Strut Front: 48520-80637
Springs Front Right and Left: 48131-12J10



Finally: Are the only parts I need to make a front strut assembly these: #10, #14, #15, #16, #17, #18, #19, & #21?
I attached a diagram


Thanks for your help.