Anyway, I found myself in a 'modeling funk' and didn't want to mess up a good kit and I had shelved this one a while back due to the issues mentioned above.
I have no idea if the kit is accurate or not because I have very limited resources on this subject but I decided to go with what I had and replace the rivet detail and improve it where I could without getting too obsessive.
Here it is so far:




Cheers,
Charles