Air Arms T200 trigger and bolt

Old NOOB here,

I recently acquired a stock AA T200, no complaints and it works fine at <6FPE. However a target rifle it is not. The trigger is heavy and balky, the bolt pull back is quite ugly. However, my 13FPE 2002 S200 has a trigger to die for in a "cheap" vintage PCP and the bolt pull back is so easy and smooth.

Any AA/CZ 200 folk know the "tricks" to fix my 2020 T200 trigger and bolt?