This is pretty much correct. The second sentence is definitely fine. Actually, the 'until now' is redundant in the first sentence. Also, it might be more natural to use the perfect continuous in this sentence. Perfect continuous is used to show that an action continues until now, except...