Yes and yes. I've so far switched from Sol to Terra but not sure even that will be sufficient. This also feels like it neuters a lot of the utility of banked/paid resets, since I'm not willing to re-up the weekly limit when I'm at 50% or whatever, but can no longer use it after hitting the 5h limit.