For #2 I got the extra stuff installed because I left all the checkboxes selected during the upgrade. I get that it make it easy to trial more stuff, but it makes my installation more complex - ie. I had to configure a couple new databases - log and netflow. I only have a simple SAM + VMAN installation.
As a side note, the upgraded Solarwinds fixed an issue I had with a manual/remote agent (exception stops/uninstalls the agent) which was a good thing for me.