The bottom one will probably do for your current front light setup. Just depends on which way the mounting point is facing in relation to the light, super easy.
Would probably make it shorter in your case but I needed to clear the underside of a rack
Have you considered the spotter (tm) brass rod?