Please help me about the writing: (1) I told him if... (2) past tense

I got confused sometimes about this sentence. How should I describe the situation in my composition?

Which one is right?

(1) I told him that if he could come to our country, I would be happy.

(2) I told him if he come to our country, I will be happy.

The fact is that I am not sure whether he'll come or not. But, at least one I can be sure, I'll look forward his coming with eager anticipation. How should I make somebody else know the situation I describe? Can I omit the word "that" in the sentence?

The other question is the past tense, here is the article I wrote to another person.

"I told Peter that Taiwan and Thailand were not the same country. Taiwan was an island beside China. It's a beautiful isaland with warm climate, magnificent scenery and friendly people."

So my question is that Taiwan is a island. That's a truth. It won't change over time. Should I replace " the past tense " it to " the present tense" ?

"I told Peter that Taiwan and Thailand are not the same country. Taiwan is an island beside China. It's a beautiful isaland with warm climate, magnificent scenery and friendly people."


I'll appreciate it if someone can help me through this.

Is there anyone can help me about first problem? Chould I omit the "that"  or not?

When we use [if] in a context, we need to be careful how we apply the verbs because of the conditional implications. 

A-    I told John on the phone that I would be so thrilled if he could come to visit us this summer.

B-    So did he say he would come?

A-    He won’t know until after the final.

Two points in this context I want  to make.

1) [that] is needed because you want to separate what you told John from what you are telling B.

2 )Because of the hypothetical condition, the past form of the aux. word should be used.