DONT DUMP THE TEST. More primo would be better, about 25-50% across the board, but i really think starting with test from the beginning would be ideal...something like test-p 300mg wks 2-12, primo 300 mg wks 1-7, 400mg 8-12, then the oral in the middle.
It would cost more but would be more...