The biggest difference between the PT and the ST is how much is borrowed from the OT. To make them feel consistent, we would have to make it consistent how much they borrow from the OT. That means make the PT closer to the OT while distancing the ST from it. Any thoughts on how to do that?
Start over.