Even if you find some job/project that motivates you a lot, that motivation won't last forever and eventually the lack of focus/procrastination will come back.
I work a full time as a remote software developer, and what helped me in recent years was to focus on developing self-discipline, which is what pushes you forward in the long term. And yes, self-discipline can be seen as a trainable skill.
I started by forcing myself to wake early and take a cold bath every week day. I've found that this habit helps me develop a work routine in the first morning hours. Even without having great productivity, I've found this greatly reduces the bad feeling you get from procrastination.
Almost a year ago, I started forcing myself to do something I used hate (but healthy, especially for someone that sits for most of the day): going to the gym and lifting weights 3 times a week. As the time passed, this became an habit which has an amazing impact on my work productivity. This may be because I'm following a program where I constantly try to increase the weights, giving a feeling of progress I don't usually get from daily work (Currently lifting about 4x weight more than when I started). It might not work for you, but this is what I'm doing, in case you are interested: https://stronglifts.com/