" But I have read somewhere that I should be looking for the best GPU then CPU after." and that is good information. Personally I always go for the best that I can afford at the time. If I had the money I would go for the i7 and the extra 2Gb RAM.
OnePlus 5 review