xAODMuonPrepData: add missing quantities to MMCluster

Whilst working on !67562 (closed), we realised that there are some quantities missing from MMCluster_v1

This fixes this, and cleans up the code a little.

cc @jojungge @pscholer