shock/strut upgrade for a 2017?

[TanguyGarage]

I'm looking to upgrade front struts and rear shocks on a 2017 Yaris L (model NCP131). My searches have shown almost nothing listed here in USA for these gen 3 cars. Does anyone have any experience or suggestions for this? I am trying to improve the handling but I do not want to lower the car as I occasionally encounter some really bad driveways so that rules out the coil over kits I've seen.
I have thought of getting the SE model struts and rear shocks from Toyota. I was also wondering if anyone knew if the TRD shocks and struts listed for the gen 2 cars would work? Thanks to this forum I learned that the TRD rear sway bar will fit the 2017 and it tightened up the handling. Wheels and tires are also on my list
Any suggestions or recommendations are appreciated. Bill