First design is excellent.
I have added some Printed elements with added fillet and decrise little bit the top of the cylinders to wel fin in with less resistance.

Very good object and fully replace my broken one :).