Hey Fuelie, I wouldn't let a dealer mess with my bike just for that either. As a comment, when I swapped the panels with my new '07, the newly built AE had the knobs to adjust the headlight broken, several deep scratches I didn't notice until the bike was in my house, missing screws, missing parts... scary. Obviously I built my bike, and swapped the panels myself at the dealer. I could undo most of their errors, except the scratches. I think you need a lot less disassembly than I had to do to swap the cluster, but I wouldn't do it: never looked, and never will look at that stupid feature. If you're adamant to change it, I'd wait to something like 10,000 miles (a figure easy to remember), and at the same time, maybe disable the windscreen auto retract feature, like I did.
And yeah, how did dealer give you the part to keep? I swap warranty parts with dealers all the time (don't want them to touch my bike if I can avoid it), but they always get mine first, as they need to send it back. They're usually happy with that arrangement since they can charge the labor without having done it. Win win scenario for both of us. Good luck.
JC