If you think these are bad, you should see the hypos our professor tosses about in class! One of them involved aliens! I think you're doing exactly right. Go you!
BTW, I think the answers to your hypos are:
1. An adverse possessor only gets the estate owned by the record-holder against whom he possesses. If the RH has a life estate, the AP gets a life estate, too, which terminates when the RH dies. See White v. Brown, 559 S.W.2d 938. Thus, if the record-holder's estate is a fee simple subject to CS, so is the AP's.
(Of course, the relevant RH is the one who owned at the moment adverse possession began. So, for instance, if O owns a fee simple when A's adv. poss. starts, but dies before the SoL ends, leaving a life estate to H, A gets a full fee simple when the SoL ends.)
2. When someone forces an AP off the land, the SoL is tolled, unless the AP immediately takes legal steps to remove him (which he can do, because he has a right to possession against everyone but the RH). The reason is that, by allowing himself to be chucked out, the AP is not acting as a real owner would, and thus his possession ceases to be adverse. When a flood rolls down, however, a real owner would run, so the AP is allowed to run, too.