I know it might end up as a bit of an anachronism from what we've seen, but from a purely OOC practical (i.e. image manipulation) standpoint, I think it's easier and best to keep the First Contact version in play. The All Good Things uniforms showed up in only 3 episodes, which doesn't give us a lot to work with when it comes to photoshopping characters, whereas we have 3 movies and several seasons of DS9 (plus the odd episode of Voyager) as fodder for the FC uniform.