I don't count rivets. Counted enough rivets when I worked sheetmetal at Howard Aero Service in SA.
I like passenger trains. Mostly colorful ones. Mine sit on the shelf but that is good enough for me. Yours is great, one of my favorites with or without diaphragms and passengers.