I like this idea.
Another idea would be turning Splash into an original attraction featuring another famous Disney rabbit...
Let's face it, Oswald has been woefully underutilized by Disney. (and Runaway Railway could have easily been a Trolley Troubles ride....)
And PatF could still have a great original home on Tom Sawyer Island. Because Tom Sawyer is pretty much dead anyway.
And I'm sorry to say it, but I have a very low opinion of Mark Twain. When I was a teenager, I was devouring Wells, Asimov, King, and Crichton on a weekly basis. But Twain bored me to tears. I didn't really give a crap about Tom Sawyer. By the time he was in the church rafters watching his own memorial service, I was wishing the little creep would have died for good.