Hello Sir!
Which Corps? My dad was in the EME and I enjoy talking to Army folks. That being said, why Kriegsmarine? It should have been Wehrmacht or Heer or SS.
Jokes aside, I do not think the City makes sense in your case. It is a strain on the pocket and the running costs of a diesel are definitely much better. IMHO, stick to the Indigo. You should get a sweet deal if you are getting it through the CSD.