If you already don't like the R front, I'd just go for the CR - I did. I absolutely love the thing (and yes I still love my 12R/S as well).
Mine also came with a little surface rust on the bolts (still need to mend), hairline scratches on the plastics, overall filth from not being meticulously cared for, and an after market exhaust (Dean Adams type :D)
Scratches on the plastics can be fixed, bolts can be painted or replaced, and the bike can be washed.
The biggest thing to watch for is the charging system (and clutch weep). Mine was already taken care of, so I was not nearly as hesitant. If the charging system (cooling rotor and upgraded regulator) hasn't been done, I highly encourage you to do it before it fails - which it will.
P.S. - If I had the funds, I'd steal the CR from the dealer out from under you!