Is you FTP improving? I agree, go back to SSB then pick a build plan. Maybe General Build to mix things up since you have a short effort goal and an endurance ride goal. General Build works on both energy systems. That being said, you can always do a Specialty Plan (Climbing Road Race, Rolling Road Race) and then go back to Base / Build / Specialty. Since you’re not targeting anything specific, your choices are wide open.
If you see that your FTP is starting to stagnate, you may need to add in more TSS. Possibly move to a mid volume plan or fit in some extra aerobic rides when you can.