Since you've got a couple years before you would send it back to Waterford, why not find a cheap beater and use it to practice applying and sanding touch up paint? $600 saved. Wallyworld has 1000 and 2000 grit paper among others in their automotive department.
However if the color hasn't grown on you enough, treat yourself to the repaint and use the two years to learn to disassemble and reassemble the bike so you don't have to pay somebody else for that part.