😄 Same as your situation, I am using Late 2013 Retina 15-inch MacBook Pro with macOS Catalina 10.15.7 as daily machine which was bought in October 2013 (also 7 years ago, time flies). Although this thing is still not showing any signs of slowing down, I am already considering my next main computing machine.
Since Apple announced Mac hardware transition from third-party’s (Intel, Nvidia, etc.) to own silicon this June, and it also promised that Apple silicon will provide better performance and efficiency compared with the current lineup (of course, if newer products are not better than those they intend to replace with, that will be wired and detrimental to Apple’s reputation), I have possessed strong interests in joining Apple silicon Mac family.
My workflows do not necessarily require systems beyond macOS, and Apple silicon will definitely bring better user experience of macOS compared with what third-parties' chips can bring, so I think the best possible experience for me can only be offered through Apple's customized silicon. Therefore, my upgrade plan becomes clear: once Apple releases 16-inch (or whatever the largest display size available) MacBook Pro with own in-house silicon, I will choose the highest spec options provided that the highest spec is not Intel or any third-party’s.
If Apple still offers Intel chips options, I will then wait for the moment when Apple silicon completely replaces Intel or Apple silicon becomes the highest spec available. Well, when I talk about "highest specs", I do not take storage into consideration. I do not need many disk spaces so I will just go with the lowest storage. However, for those which will affect speed and performances, such as processor, memory and graphics, I will go for the highest ones.
But I still respect your decision in purchasing an Intel MacBook Pro due to its universality of compatibility and versatility in many business as well as engineering environments. Hope you will enjoy it!