Usually the optimal rpm for shifting is at or almost at redline; especially for unmodified and non turbo cars.
They keep max horsepower until redline so you really shouldn't need to shift early (modified and turbo cars have a different power curve).
You want to maximize horsepower for any given moment during acceleration! Some people tell you to shift at the peak horsepower point (8250 with the Huracan), but this doesn't work out.
Shift only when you get more horsepower in the next gear, than the current gear!
I'll give the nod to the higher rpm 2016 model.