Ok 1600 grams is A LOT. You are about 100 grams overweight. No wonder you are slow.
get a better esc/motor combo.
Hobbywing JustStock and something like a Trinity 24k, Tekin RPM Gen 3, etc.
you want to go UP in pinion not down. Try 33/34 with a 72 tooth spur.