According to the Darlene Speckmann - the lady that named Peaky and Spike - if you are not happy with something now - the chances are you will not be happy with it 20 years from now.
If it is still at a comparatively easy stage of the process to change it - I would.