Thanks for the images, those definitely helped.
Another day of modeling and it's mostly there (shown with the end cap off):
And I decided to just throw it in Cura, slice it, and try printing it. It didn't come out too bad:
There's a few more greebles to add, then I'll send it off to...