I think Hwa Xia sells the swimming floats you r talking bt.. It is a ring float but with a additional "underwear" so the baby can sit in it. I think it is rather exp.. around $30 if i'm not wrong.. I can check it out for you since i'll b there tm.
As for the swimming diaper, you can get lil swimmers from Giant cos i got mine from there.