Sounds like you need to move everything down a gear. Where you formerly used 4th, use 3rd now. (2000 rpm @ 40 mph is where my 4th gear was). Where you used to use 5th, now use 4th. And the new 5th is all bonus!
I expect P&G will still be useful. I do 4th gear pulses regularly, so it's not just about coping with a short top gear. It's about alternately using optimal BSFC and free coasting. What it should give you is better highway speed options whether cruising or p&g'ing. Sounds nice.
When I swapped to the Fit, I went backwards in this area. (Honda went backwards, that is
) Now I'm at 2800 rpm @ 60 mph.