Amazon offers and reliability are notoriously fickle and questionable. I've done rather well with Rose bikes, however if Amazon is where you must be then maybe use the more traditional sellers to pin down what you need then go find it from Bezos Inc.
The IQ2 isn't shabby at all. In parallel I've been running the slightly cheaper Lumotec IQ Cyo Premium T senso plus for years and dead happy. What's the dynamo you have? Is it 3W and still rotates acceptably? And maybe what you need is a really good mount to avoid the rickety-ness. SJS have been pretty good for things like that for me.