Maybe consider a ThinkPad P1 Gen 4.

$$$ but can be had for 40% off.

A good spec with the nice screen and discrete graphics is < $3k.

Upsides: Great for Ubuntu, everything just works. Screen is beautiful. Keyboard is brilliant.

Downsides: Can get hot. Battery life sucks. Still 11th gen - Tiger Lake.