Resetting is pretty much your only choice.
I've gotten most of my villagers into aligned rows, it just took a little while.
Since I haven't really developed my town yet with pretty paths and whatnot, I put a bunch of cheap placeholder pwps around my town to stop villagers from moving in that area which increases the chances they'll move into the general area I want them to be.
I plan to demolish them once I've gotten most of my villagers.