For #1, the top of columns and top track should already be connected by screws on front and back sides as shown on your sketch. The 1 angle I showed was to connect beam to column.
For #2, I agree with you, I will reconsider this on my design, but for most of my projects, I do not see a that big...