Adam,
Keep the commander. You know you love the aircraft and have lavished loads of attention and cash already. It would seem to be a good fit with the short field ability and sleep in plane comfort. You will end up spending money you won't recover if you sell it so best is just to keep, it fettle it until it fits your mission profile and continue loving it!
Caber
