For 1) that would be fine with me, with the only exception that this is done after toponaming has been merged-
For 2) I don't know how to achieve this. I already tried to turn off the formatter but as I wrote, this does not help, only creates more work. Up to now, I was very fine with the way VC does the ++ formatting.
Note that I cannot state about python because also for Python I use VC and VC is bad in auto-formatting Python code (at least I have to undo often unwanted changes).