You forgot the 5-6 hundred bucks worth of Dyno time, realistically at this point you have already put a bout 2500 in the CVO for some pipes a SERT or Power Commander and some dyno time for the custom EFI map.......and then also have to do a new map on the new set up so add another 5-6 hours of Dyno time.
All I changed were some pipes and added a race tuner so far added a few bits of chrome and I am already in the 35 thousand dollar range.......saw a nice new Ultra for 20g......if I add 15 g into that will it blow away my CVO.......probably. DO I care? Not really, a majority of people in our great country have never even experienced riding a motorcycle of any kind. I remember my first street bike a Suzuki GS550 1986 Model. Back then the dream was a Harley.......ANY Harley.....how can I afford to get a Sporty?? Now cruising around on my CVO reflecting on that..........My grin won't get much bigger than it already is at 75 mph knowing this is my bike and I love it ! I am sure you would get the same feeling with either option!