Both of your examples are understandable and acceptable, but in my opinion it should be written thus: Everything I've done (up) until now has been a mistake. "(up)" means that the word "up" is optional. CJ
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.