Old Car Marine

I own an 83 280zx turbo and the timing does not seem to advance enough. When you set the timing to the correct position the engine stumbles above 2250. If you advance the timing the top end runs great but it stumbles at low end. I have changed the distributer and found that it is advanceng but not enough. It also tends to run rich. Can someone please help.