Although you may want to keep your stock setup, if you are willing to root, there is a phenomenal ROM that addresses the camera issues in dramatic fashion. Just search Poprocks V3 on XDA. It's a lollipop TW ROM for most variants... Top benefit for me is the fact that my note runs cooler, battery...