Thank you for going all the way from suggestion, fabricating, testing, writing up and providing pictures for a solution!
On a separate note. Your Q45 looks somewhat similar in fit to your S30 now (and S40 previously). I know they are completely different machines but what are the differences...