I already solved my problem: I moved to the competition and I keep using my 2010 Mac mini.
I was waiting for a Mac mini update, hoping to get a better GPU for games. I was tired of waiting, so I just built a low-end gaming PC.
The net result is that my current 2010 Mac mini is more than enough as a work computer (Web development) and my low-end gaming PC, which I can upgrade piece by piece, cost me half of a new Mac mini because I was able to get all the parts on sale and I was able to re-use a power supply and PC tower I already had.
But man, that PC sure is huge compared to my Mac mini. If anyone is considering building a gaming PC, I'll just say two things: mini-ITX and Cooler Master: Elite 110.
I totally agree as I will keep my current Mini to stay in the Apple eco system with my iPad and Phone but when it comes time for the 4k move I may just go with a NUC or BRIX with Broadwell or Skylake depending on timing as a HTPC and run either Linux or Win9 on it.
But then again the new Mini if and when it comes may surprise me.