Long Course Season - Short Course Trainer

Here's the situation. I'm 29 years old and one year back from a 10 year retirement stint. It feels like I'm still trying to remember how to race (that first meet was tough), but things are coming around. It certainly isn't as easy as it used to be. But I'm getting away from the point. Currently, I train myself. I'm in the water about an hour a day and training in a short course (25 Y) pool. I shoot for 3,000 yards in a one hour session. But quite frankly, I find that my long course swimming isn't as good as it should be. By the end of the race, I'm struggling. In short course, however, I've still got the power I need to crash the walls. My short course times showed good improvement over the winter season, but my long course times remain unchanged from last year. It doesn't take a geneous to figure out that I am screwing something up with my training. My typical sets are as follows: - 10x100 on 1:45 or 1:30 - 12x50 IM style 1-6 fist lap, 7-12 last lap on 1:00 - 12x75 pull on 1:20 - 8x150 kick-drill-swim odds are fly/free even are back/free on 2:45 - 9x75 IM style 1-3 first lap, 4-6 second lap, 7-9 last lap on 1:30 - Water Polo Pyramid 25-50-75-100-100-75-50-25 utilizes head-up swimming, backstroke, freestyle, and underwater swims with a 30s base interval - Broken 1000 (400-300-200-100) (normally a warm-up) - 5x200 (1&5-Freestyle, 2&4-Even Lap IM order, 3-IM) - 10x100 kick w/ fins (fly and free) on 1:45 - 10x50 kick w/ fins fly/free on 55s. Are there certain sets that I should, or shouldn't, be doing with a short course training facility that would help me prepare better for the long course races??? I'm dying here because the big season is the summer season, and my long course swimming is falling apart. Looking for some help on this one. Thanks.