Instead of feuding with Finley, Boogeyman should feud with Little bastard. That'd free up some time for Finley to feud with Benoit.
And to end the feud, Boogeyman could regurgitate Jillian Hall's whole solid mole onto little bastard and it would stick. It doesn't have to make sense, they should just do it.
Edit: Another idea came to me. After this feud, they should bring back Tim White, who would try to kill Little Bastard every week in new and interesting ways.