Hi, the first one is too vage to discuss here.
马上就。。。了
It's use like this: I 马上就 finish home work 了. The home work is finised, because of you.
马上要。。。了
the sky 马上要rain了。So it's going to rain. You can't rain. So you use 要 here。
example, you and your wife are going to take a train. But your wife is doing makeup. So you would say
Hury, it will be late. 马上要晚点了。
she would say,
I almost finish it. 马上就好了。