Looks like you are doing stellar work. Consider making the tender 1/8" wider - requires new top sheet metal and a 1/8" strip in back. Put an inner brass piece at those seams.
Rivets are trivial for a guy with your skill. Let me know if you need hints.