Anything on the 3000 series side of things would get you past the TPM issue, if you're looking at any sort of video editing then more RAM might be useful..
Spec wise you arent a million miles away from what you want tbh, a bit of wisely spent money on 'used' parts could see you right easily enough...