My two cents - I also managed to cross it off my bucket list late last year (If you're curious, some pictures from the Private Room + Suites class are
here on my blog
If you can wait, I would definitely wait. The Suites class as it is is really outdated when compared to the latest and greatest offerings from other airlines, such as Etihad. Singapore Airlines are due to get new A380s this year and it is highly likely that they will debut the refreshed and refurbished Suites class (or something new altogether).