I've got a feather as well and while it's a decent enough bike, the only things that remain stock on mine are the frame set and headset. In your position I would go for the Wabi, which will save you from having to go the long, drawn out and more expensive overall route. If you want to support your LBS, then get the Fuji and upgrade the really heavy wheelset with some Wabi wheels or similar.