I can't find where this was suggested, so I am hoping it was here...
I agree with making homeworlds and maybe core world always use the old logic (pick whatever) for reinforcements. Maybe for core worlds though, they could use this logic, but with an altered probability distribution. (40% for whatever, 60% focus logic or something like this)