The answer is yellow (power) and green/white (hi beams) for anyone who needs this in the future. I put a big red switch below the radio, it actually looks decent. Also, just to confirm the indicator does use the high beam wire to turn on, so no separate wiring is needed.

Congrats on getting this working! You should post up some pictures of your set up if anyone else wants to do the same.