If it comes down to you replacing the speedometer, it can be swapped from the clusters between the Auto and Manual cars. Once you pop off the clear plastic front of the cluster and take of the black plastic cover (where the idiot lights are) there are three screws holding in the speedo from the back. Just swap as needed to your original cluster.
__________________
|