If $2000 is budget rifle, I would absolutely love to see your build when you go all out.
Two is fine, but if you DO HAVE the $2K for a build, it will open a lot of options.
But don't fret it too much. Do what 'feels' good. You can use 'knowledge' on the next two or three or four . . builds.
I would think that you have the budget for a great barrel / upper. I would also go for a 'matched upper/lower' such as AeroPrecisions or other good name.
Keep her tight with a good barrel...