Motivated Junior looking for SAT advice!

I’m an upcoming Junior, and I’ve been sort of “boot camping” for the SAT the past 2 or so weeks using Khan Academy + school prep. course. I’ve seen consistent improvement in my scores, but I’m looking to keep my current score up until November when I take the SAT. It’s important to note that I took a Princeton Review math test that was painfully similar to the math section I had on my last practice test (questions were similar but with different numbers).

CB Practice Test 1: 1360
CB Practice Test 2: 1340
CB Practice Test 3: 1430
CB Practice Test 4: 1570 - 39 Reading/40 Writing/39 Math

I’m looking to maintain the skills I’ve acquired and continue improving. Do you guys suggest I continue to spam practice tests and continue using Khan Academy? Is there anything else I should be doing?

P.S. I don’t really want to take the test in October… I only want to take it once and get it over with, so I figured taking it November would maximize my chances of getting the score I want.

[EDIT] This is kind of a stupid question, but I’ve always wondered if the SAME TYPES of math problems with just different numbers repeat themselves on the SAT? If so, is there a way I can learn to do everything single type of problem that I approach?