Hey Alex!
Ok the second method you mentioned and talked about here seems like it’s most suitable as you can adapt to both types of returns. If it’s long and fast you have enough time and don’t get forced into a block and if it is a short return a small step in will get you there.
It’s important to have a stance when serving and recovering that doesn’t need to change depending on what serve you do. That way you can build the consistency and muscle memory with the movement and it will become natural.
I would also say you mentioned getting to a low crouched position, this is one of the most important things to being able to adapt to different returns after serves, so really focus in that as well as keeping that 5 inch space at the end of the table to give you the best chance for a positive follow-up shot!
All the best, Dan