I am not sure why you feel Servo is a huge mess. I have worked on all of Gecko, WebKit, Blink, Servo, and Servo is distinctly cleaner. (I think it's mostly because it's newer.) I guess it is still huge.