At this point, crowds and desire for at least some simplicity in pricing would probably justify just swapping out Friday/Sunday in the current scheme. FFP every M-F (+first Saturday), plus gives you all the Sundays. I don't think this would have a noticeable effect on Friday crowds, would likely take a chunk out of Sundays.