I'd kind of rather like to keep them separate since they do separate things. Mine is intended as 'this is the quick and dirty way to do things, nerfing nothing and buffing only the most extreme outliers. Also everyone has six advantages now'. Yours is a much more balance focused patch.

That said, what's with the huge nerf to all the general rolls? Don't VP rolls comprise 19/20 rolls you're going to see in any given game?