RE: motor angle direction??
If it flys well now, without any tendency to pull to the right, or up by itself, leave it as it is.
Should it seem to always want to veer right or up as high power is applied, consider 2 or 3 dgerees in the direction opposite the pull.