Two overlapping meanings of "will"

The verb "will" has many overtones and meanings but I want to bring up these two:

1. If you will help me open the door, I will take the desk out.

"If you will help" means "If you consent to", "If you are disposed to", "If you are willing to".

2. I will drink this beverage now, if it will make me stronger tomorrow in the competition.

The combination of two "wills" is OK in this case and I know why. But I wonder about this sentence.

3. If you will help me learn this poem by heart (tomorrow), I will help you with your homework now.

My questions:

a) Can 3 sound ambiguous? It has the same relation of tenses as
sentence 2 does, however, if we removed "tomorrow", could it mean "If
you will" as "If you are willing to"?

b) Can 3 be said like this: 4 If you help me learn this poem by heart
(tomorrow), I will help you with your homework now. Which one is
better 3 or 4?