All depends on your budget man.

You should be able to fit 120mm and 140mm angel eyes easily to replace, amber ones won't be as easy as they aren't as readily available, TRS versions are pricey.

I'd say EvoX-r as an easier swap but you almost have that now with your clear lens RS6 projectors.

I can't see a pic of your cutoff but if your bowls are like the EvoXR you should be able to slot the mounting holes, and shift the bowl upwards to expose more hot spot (and even them out between sides), as well, to fix your rotation instead of bending the shield I would adjust at the shield stop, or fix rotation laterally by shifting the bowl.

Hope that helps but your projectors are pretty damn good as is, telling you to spend 150 on FXR's that would be harder to fit is not good advice from me lol

__________________
2018 Ram 2500 6.7L Cummins 68RFE
19k miles -Bright White/Black - Big Horn Sport - Crew Cab Short Bed
2013 X5 35D (CEO's) - Born on 5/17/2013 -
82k miles - Alpine White/Cinnamon Brown/Premium Pkg, Sport Activity/Premium Pkg and Sound/20" Style 214/Running Boards