The two original sentences are fine. So are your two. They all mean something slightly different.
"Jan is going to finish school by next summer." means that she has decided/planned to finish by then.
Note that you have "future plans" under both 'will' and 'going to', not that that's wrong.