Those are all probabilities if they were to go with the new 7.0. But back to one of the comments that I made previously. With all the changes that would need to happen to accommodate the new power plant other changes to the chassis, suspension, steering, etc would also need to take place. This all takes time to develop as well as money. I highly doubt Ford will do this at this point seeing the success they are currently having with the GEN2 model. Will it happen in a future GEN3, possibly but the business side of making a power plant swap at this point so early into a generation is highly unlikely. The may introduce a special edition model from say Shelby or Roush but not marketed as a Raptor.
This was the conversation I had with one of the Directors of Ford North America last week at the Houston Auto Show. We had a long converstation about the Raptor and my thoughts on it since I recently purchased one. Not going to mention his name since I am sure he would be getting calls if I did.