So I assume he'll wear his original suit... till the final battle where he takes on the Mark II which is Giant Man.
I don't think so. As was mentioned before, he doesn't need separate suits to become Ant-Man or Giant-Man. He's likely just in the Mark II from the start.
He was already fiddling around with the Ant-Man suit and making unauthorized modifications in the first movie.