Nice kit that one, really looking good! When it comes to rivets I have my punch-and-die set that makes plastic discs from 2.0 down to 0.6 mm. I have no idea if that’s small enough. They can be glued with Tamiya’s extra thin cement.
Best regars
Andreas