The B thing will be implemented for sure, and it'll be integrated into A as well. B is really just meant as a shortcut to end the round.
Money is the score tally of life these days, so I reckon it'll work well enough here, though there'll be a turn counter and max money tracker.
What I'm thinking for the income thing is show an icon over things that will give money. The text box is rather small, but I'll scout for options.