To awoid "I think that...":
What other grammar books have you studied? There are some books which can really help you with "will" and "going to". One of the most famous of them is "English grammar in use" by Murphy which helped me a lot.
Interested in Language