To me, you can do both.
However, the fact of wearing two different handguards and knowing why you wear them like that, i find that it adds a little to the history of the replica
The same goes with his biceps hooks. He doesn't always have them, and not always in the same configuration. The right biceps hook you see in the thrash compactor is different than the very uncommon one you see in the control room, and most of the time he doesn't have a left bicep hooks but you can clearly spot one in the thrash compactor scene.
I think i would just pic those little details from scene to scene that make the suit unique and mix them together. Just my opinion though, do as you prefer!!