Nice Bike!
I have been running macs and BMC motors for years (nearly 10 years) , 2kw is the sweet spot, anything over that and you will quickly blow the one way bearing in the freewheel or rip the teeth out of the gears, riding style also matters as you have found out, nice smooth assisted starts and no sudden jolts.
Have you checked your one way bearing? Are you getting a complete new freewheel or just new gears? if you are just getting the gears by all means fit them but if you find the drive slips when you apply the power its likely that the one way bearing has gone as well and you will have to change the whole assembly.
My experience in running high power has been the one way bearing breaks and spits bits of itself in to the gears damaging the gears.
Running high power very often will desolder the power wires as well, the power wires are often poorly soldered to the axle power cable and will unsolder themselves at higher power, whilst you have the motor off its worth getting a 50W soldering iron and remaking them as they will in time become unsoldered.
Good luck with the bike.