As someone who said "My next iPhone might be my last", just go ahead and leave the platform now. I ended up being irritated with so many things about that iPhone, looking longingly at the other side. You can always switch back later if things improve :)