Cheers mate,
first off: Cool that you stop by here!
Yeah, I think on the first part we’re all in agreement. Good that it didn’t take out the Black Orc Bigboss before he could strike, so I guess no harm no foul on that one.
As for the second thing, that makes sense too! But then again, maybe the question is if the alignment in part of the charge move. I would argue yes.
I think making these charge move is one of the most complex things in the game, but are often also the most critical. It’s unfortunate that the graphic on page 130 is set up like it is, because if the charging unit would be just a little further away or at an angle initially, it could make the charge to the unit but then not be able to align, but maybe would have needed to make a charge move which would not follow the general rules on p126 about using the shortest way possible and/or move in an as straigh a line as possible. And given that it my either be in the interest of the charging unit to either charge both or exactly the opposite there is a lot of room for potential rules conflct. One could also argue that the rules on p131 about “accidental contact with an enemy unit during the charge move” would apply, as the contact would happen during an align move.
I’m sure this will be addressed in a future FAQ, as it has so many implications. My gut feeling would be that only impassable terrain would deny a charging unit the opportunity to complete the charge move including alignment, as every other situation can be resolved with consequences for the charging unit which, in this case, would be to make contact with an enemy unit.
In any case, I’ve added it to our FAQ compilation which, at some point, we should send out again 
There some important questions there.