That's a tough position. When I was studying for a retake, I still had about 25 tests to use. I think that you should retake some tests that you haven't taken for a while, and hopefully you won't remember the questions. But you need to keep up endurance.
I would suggest your first strategy, but don't totally ditch the PTs right now, and don't totally ditch the review books closer to the test. If you have the Bibles (which I used), they would be very good to review. If you scoring where you want before the June test, don't get too crazy with the studying. 3 hours a day seems like overkill.