This is exactly right (mine is technically a ZAM too, but I replaced the gauge faces with US/ZHP ones and painted my needles red shortly after importing her).
And IIRC the reason you have leather wheel/boots is because you have a 2006. As much as I love a fresh alcantara wheel, there’s just no comparison to the ease of living with leather instead.