I recommend buying used - you can double the value of your system options, and I believe at $4k you can see a material improvement in overall system components, particularly WRT speakers. You should have a few good options on the integrated for between $800 - $1,500. I just upgraded from a Marantz PM-8005 to a PM-11S3, but the 8005 was excellent in its own right and has both a great phono preamp (MM only) and headphone stage. These are $1,200 new, but regularly show up for $700-$800 used.
I am a fan of Focal speakers, but have seen lots of good used options offered for under $2K. Theer is a pair of Triton 2's for sale on Audiogon for $1,800 ( I have no relation to seller). I would STRONGLY recommend auditioning any speaker before buying as the SQ at this price point vary significantly.