@Daniel Tisdale
Ok I'd start by figuring the numbers on the current house. Get your rental comps and do your research etc. Now you have a baseline to compare
Now look at properties running the numbers on them as a rental. Find one that meets your criteria and the numbers work for you. With this we can easily see how the two places compare when they are apples to apples.
Next, which suite do you want to live in? Remove that rent income from your numbers and see how that changes the metrics. Play with this looking at the different scenarios. Watch how your cash flow and returns change depending which suite you live in. Think about how this impacts your personal budget also.
Now you compare those metrics with your personal wants. For example, maybe you want to upgrade your living space so you will take the upstairs of that new house and sacrifice a bit of cash flow OR you take the dingy 1bed suite in the garage so you can get the bigger return.
Only you can decide the value in these scenarios, but doing it this way you can see what those decisions 'cost' you.
This really is a tldr though there is many factors here.
Knowing what your next move after this is going to be is also something to think about. Could be an opportunity to accelerate that. This is where I would start, personally.
Hopefully this helps and doesn't muddy the waters :)