Brass Birmingham/Lancashire Barge and Train

I wanted to upgrade my version of Brass:Birmingham.

So after printing an insert I decided to do some component upgrades.

I've found those two projects:
https://www.thingiverse.com/thing:3669992
https://www.thingiverse.com/thing:3399559 (I couldn't link this as a source :( )

But none matched my exact expectations. So I tinkered around and came up with those versions.