I think they should just pull FP from Star Tours. I've never seen the line longer than 20-30 minutes, which is totally reasonable. FP is just unnecessary, and the distribution area clogs up an already overclogged passage in the park.
Now, if they refurb Star Tours so it gets additional destinations, the lines will probably become much longer, and FP will once more be a viable option. But that won't happen for a while if at all, so there's no reason they couldn't pull the machines and put them in storage somewhere and free up some room.