I loved my Tanaka M24, unrestricted, with PCS. It was an amazing rifle, very accurate, and it felt very nice.
My CA M24, I never upgraded myself, so I don't know too much about it. It was a fun rifle, definitely not AS fun as the Tanaka, but it shot well, and it was cheaper than the Tanaka.
Personal choice: The Tanaka for me. FPS variation with the gas system that the Tanaka uses is very little. Never above 8-10. Propane is an excellent source of gas, and if you choose to use Green, you need to clean the bucking every so often. However, I have definitely hit 200+ shots with the Tanaka, and have for sure hit a 250ft target with minimal wind. Very consistent rifle. If you choose the full upgrade route, you can get the rifle hitting amazing groupings. Stealth Killer Hamster on this forum, actually has a picture on the forums of his groupings with an upgraded Tanaka rife. IIRC, the Tanaka M24 also comes with a tightbore stock.