Yes she does have Squall. Ultimecia lives in the future, and doesn't have a knight. The theory works on the principal that at some point Squall leaves the picture. This is my personal belief for Griever's presence, at some point Rinoa created it as a way to hang on to Squall.