The roundnose water box will fit fine. Good luck finding one though... I can have a look and see if I have a spare squarenose one if you like