I'd definitely recommend waiting for the 6 as it will have a lot of big improvements. Mainly new things like wireless charging, water resistance, lots of camera improvements etc. I will try to document as much as possible. Also, OnePlus will stream the event live so you can't catch everything as it happens.