I get my SR+ with 19" sports wheels this Saturday, but I did reserve back in 2017. You are probably right about the additional wait but I'm sure it will be worth it... they look so much better in my opinion.
If you change them just to get it sooner you might regret it down the line.