In general I'm in favor of this.

On the win streak piece I would actually extend this even higher than 4000. I don't think you want to overly discourage high rank players from engaging, and if there's too much to lose when you're at like 4500 or 5000 you'll just see those players (who may also be the ones most likely to spend for energy) playing less.

Besides that I'm in favor of having variability in the points won/lost based on rating differential.