In the same boat over here. I have ~$3K budgeted and ready for a new laptop but I am holding on to my 2013 MBP because of the current generation's keyboard.
I have my fingers crossed that they will redesign the MBP and fix the keyboard before my 2013 dies. Hope springs eternal.