I’d look at best bike split to validate your assumptions on wattage.
This sounds like adding more and more time at VO2 is the key - i’d look for workouts that add more time and more ‘on’ intervals over time. Starting from those 30s on/30s off, going up to 3 min.
The 8 min FTP test is the final tune up ride 