Which motor for my Buggy?

Hi,
I currently have MEDUSA 36-60 1800kv motor with EXRUN 80A on my XRAY buggy, running with 4S gearing to ~35mph.
Its directly attached to the chassis with Novak Motor Plate.

I'm very happy with the performance of this motor, a lot of punch and very long run time. I also like that the motor is very small and light.
The only issue is that the motor is running a little hot around 160F.
I live in hot area, typical temp at noon is 95F.

I'm looking for additional motor setup for my buggy and I have two options from previous projects:
1. NEU 1515 1Y/F (2200kv) that have special design to be attached to the chassis, so no additional cost here, not sure that the EXRUN 80A can take it.
2. NEU 1512 2.5D/F (2050kv) I will need to buy the Tekno motor mount kit so I can attach it to the chassis, that will be an extra weight and cost.

What do you say? which option is the best for me? I'm running only on the track so I want to keep weight low and the running time high.