I have been very satisfied with both of these Computers in meeting my present computer needs
In what way are your needs changing? I don't see any urgency to upgrade based on what you said, unless you are the type of person who wants a new computer every couple years. When you have an actual need then you can survey the current product landscape. By then we may know the fate of the Mini.