1794 to OEM TRD Sport Bilstein or Eibach Pro Sport Shocks

Looking to upgrade my stock Hitachi '24 1974 shocks for street only driving & no lift. It just feels really soft, especially braking.
Would switching to the OEM TRD Sport Bilsteins be an actual upgrade? I see the front is lower on those and would probably need the matching springs instead of my 1794 springs?
I assume the Eibach Pro Truck Sport shocks would be what I'm actually looking for, but I don't see where anyone is using them in stock springs and no lift.
Can anyone provide data or personal experience comparing the OEM TRD Sport & Eibach Pro Sport shocks? Thanks!

 

I’m about to put the Eibach Pro kit in my 22 OR, I’ll follow up with ride comments once done. I’m pretty sure i saw in their literature on the shocks that they are compatible with the factory springs- it’s a circlip adjustable system, I’d guess you’d be able to work out height setting to stay stock height.

 

Finished the Eibach lift install- pretty easy DIY. The instructions that come with give the option to leave factory springs in the rear, and the front shocks re-use the factory spring perch and top hat, so I’d assume you could use them with factory springs as well.
The ride is great! I had Bilstein 5100 lift on my Tacoma previously, I liked the ride but it was definitely much firmer than the Eibach on my Tundra. Very happy with the look & ride.

 

I upgraded my front and rear sway bars and that helped immensely.