Great progress there Dennis, well done!
...and yup, curved spokes 
In hindsight you could have aimed for the square reservoir model to avoid that...but then the base/reservoir most likely would have been more troublesome?
(Attachment Link)
I think the squareish reservoir would not be to much problem
I would start with round brass tube and a steel former then silver solder a base inside .