Mark Graham has had a good rep over on the FAL Files for nearly two decades. You could do much worse.
As to your rework. I have the same gun, a British L1A1 kit built on an Argie receiver (later thumbhole models were built on Imbel receivers). Other than the lopped off barrel threads and the god awful Bell & Carlson thumbhole stock it's a nice gun (built before the "angry beavers" took over FAL production at Century). I'd recommend looking at Ironwood Designs for your US furniture. I've gotten some very beautiful wood from Matt for both FALs and AKs and never been disappointed with the quality. He even offers "fancy" wood upgrades for L1A1s that's just pretty enough but not too over-the-top.
The problem with the rat race is that even if you win you're still a rat!