Stop in for a cup of coffee

so someone texted me last night, suggesting that perhaps the ammeter circuit could be causing it to die after starting. Started reading some threads and it does sound plausible. But i just wanted to clarify a couple things:

The first schematic is the factory routing right?
amp-ga18.jpg


And diagram B, is what I should make it look like to bypass the ammeter, correct?

amp-ga27.jpg