Dv,
you seem to be on the right track. the only thing I can see that may be an issue is the plug choice, most of the XB guys swear by the NGK Iridiums. Tire Choice has been discussed several threads over. wraps the same, I personally like the clean look of Ceramic coating, Black with red stripe ala the 1125cr, should look very sharp on any Black Bike.
As far as keeping it running for the 20k, with regular maintenance it will do that many times over. I have a 98 S3 with over 60k, replaced the final belt once, it didn't break just thought it was time. oil and filter changes, plugs and wires, clean the air filter.
Good luck and ride Smart and Be Safe.
Later