Yes, you could leave a stiffer shaft full length and use a heavier point. However, this would be heavier overall than a shorter weaker shaft with the same point. According to Dr. Ashby, point weight is more significant than shaft weight in determining arrow penetration. So a longer, heavier arrow should be less effective for hunting than a shorter, lighter arrow with the same point, because penetration would be about the same, while arrow velocity would be less with the longer heavier arrow.
However, if for reasons of your own you prefer a full length arrow, given the results of your tests, a 2016 would be the next logical choice.