Ok, now I understand what you're saying about the angles. I was in Stab mode, which only controls the attitude, but not the thrust/altitude. There is an Alt_Hold mode, which is the same, but also controls altitude. I could have used that but just didn't. I should do some test flying in that...