I voted First Contact version. It seems more logical that a military uniform look... you know... like a uniform more than a rainbow.
My one exception is TMP's Admiral Kirk wearing his grey/white uniform. With black pants it would have been perfect.
“The test of our progress is not whether we add more to the abundance of those who have much; it is whether we provide enough for those who have too little.” -FDR
God gives us what we can handle, even if we don't believe it ourselves.