@Kozushi, just as you may add judo practice or other athletics to S&S, so you may add some heavy, 2h swings. Keep S&S by the book, and throw in a few 2h swings for good measure. Think of it like strength training - low reps, long rests, heavy weight, and I'd try limiting yourself to 30 reps per session max.
-S-