I think that I have all what I need for the calculations, but I will contact you in case any problems should come up.

Also, the reward curve graphs being shown are not correct

Yes, it does not show the actual curve, that's true. I just wanted to show a rough image that helps to understand what is going on.

Currently on SteemWorld the rshares are being represented as they are being returned from the nodes (converted 1:1), so in real the vote and estimated payout amounts are (partially) still based on a linear curve.