I've heard good things about Wheeling's motard wheels. If you want to switch back and forth, you'll want to get the brakes also I believe for quick change.
http://www.wheelingcyclesupply.com/shop/1/12/index.shtml
If you want to go permanent--see if you can find someone who wants to convert an X to an R?!